Continuing cleanup
Merge pull request #2 from DragonBe/master

Continuing cleanup