City class refactoring