Hey Enrique Sir. I have taken some time to tidy the code base up. No conflicts to report

Please accept so the team can do a re-fetch tomorrow morning. Cheers.
![tumblr_m69beljyha1rzye8vo1_500](https://f.cloud.github.com/assets/1581018/504352/e6dca02a-bce4-11e2-82f6-1b081f65444f.jpg)