#47 refactoring Client: refactoring succeed (not finished)