Small refactor of controllers.