Controllers Refactoring