Assorted cleanups
Merge pull request #34 from jetty840/dcnewman-merge

Assorted cleanups