Refactor the controller structure
Clean up the mappings a little.
Fix white spacing for better separation.