refactored Building Controller