Clean up controllers a bit