small refactor in buildingGen
Merge branch 'zhandev'