Refactor controllers a bit.