More controller refactoring