Controllers refactoring.