Changes as suggested by @reyery
Changes as suggested by @reyery

These should be the last changes before the merge.

architecture-building-systems/CityEnergyAnalyst,architecture-building-systems/CityEnergyAnalyst,architecture-building-systems/CityEnergyAnalyst