cleanup
Merge branch 'cleanup'
Merge pull request #3 from snorpey/master

cleanup