controller cleanup
Merge pull request #23 from st028/controller_cleanup

Controller cleanup and commenting