Refactoring
Refactoring controllers