some refactoring
working on the city import