Refactoring ServerClient code.