Completed refactoring 5.3
Multiple small readability updates accross the controllers package
Merge branch 'master' of https://github.com/RenjiClark/Refactoring-SDD-2010.git