Cleaned up controllers a bit