Minor controller refactoring