Bunch of comment fixes and clean up
Merge pull request #18 from pavanh91/master

Changes to clean up code.