* Controllers refactoring