small refactor in class City