refactor controllers
Merge pull request #81 from purple-martins-2013/refactor-controllers

refactor controllers