Refactor ClientGenerator
class to use private fields
#280
+398
−385
ClientGenerator
class to use private fields
#280