Misc cleanup
Merge pull request #10 from Adubbz/master

Misc cleanup