Minor controller refactor