Controller cleaning

Maintenance
Merge pull request #23 from UberLame/master

Controller cleaning