some refactorings, city model