CityBuilder changed positioning and javadoc