cleanup
Merge pull request #1 from jsoverson/master

Various cleanup