cleaned up controller
Merge pull request #15 from theoblivious/model_cleanup

cleaned up controller