Client project
Refactoring