Refactor place controller