Refactoring of the Client class source code