Did some refactorings following running Rubocop on building.rb
more refactorings suggested by rubocop and reek