code cleanup
Merge pull request #1 from dudhead/master

code cleanup