Code refactoring
Client template created.