Some cleanup
Merge pull request #1 from GunfighterJ/master

Some cleanup