Minor cleanup in the Controllers
Merge pull request #21 from Ayyzee/cleanup

Minor cleanup in the Controllers