Cleanup
Merge pull request #2 from brucekissinger/master

Cleanup misc