Refactoring controllers.