small refactoring to lean out the controllers
Merge branch 'master' into heroku