refactor: flatten the methods in Client
#1914
+213
−315
Merged
Client
#1914