Refactor place building