code cleanup
Merge pull request #44 from fusion94/master

code cleanup