cleaned up City.h