Cleaned up the controller models

Will be doing a bit more later