Cleaned up the code

3 jobs for 16-clean-up-contoller-code in 2 minutes and 59 seconds (queued for 6 seconds)