Controllers refactoring