Cleaned up the controllers a bit.