Some more controller refactoring