Cleaned CityBuilder fields' and methods' naming, added missing methods.