Minor Cleaning for controllers.