building refactored
removed comment that was displaced