general cleanup
Merge pull request #1 from bczulauf/ben-cleanup

general cleanup