Made a bunch of stylistic changes requested by damon
Merge pull request #842 from tarunc/damon-changes

Bunch of stylistic changes