some controller cleanup
Merge pull request #43 from dalexj/cleaning

some controller cleanup