client code refactoring
Merge branch 'master' of https://github.com/MikeDenisov/CleanCity.git
Merge branch 'master' of https://github.com/MikeDenisov/CleanCity.git