controller and model cleanup
Merge pull request #25 from JPrevost/code_cleanup

controller and model cleanup