Cleanup add building
add building
refactors