cleaned up the controllers a bit