Refactor buildings