cleaned up controllers a bit