Refactor Controllers

* Extract finder helpers