Cleanup application controller
ALL HAIL MVC!
Merge pull request #3 from kugaevsky/refactor

Refactor