general cleanup
Merge pull request #300 from hustonhedinger/cleanup

general cleanup