Refactoring Client.class