fixes based on the reviewer comments
fixes based on the reviewer comments

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