Further Controller Refactoring