Controller Refactoring