Clean up controllers
Merge pull request #1 from seanmcmills/clean_up_controllers

Clean up controllers