code cleanup
[refacor] some additional clean up
Merge pull request #73 from davidmoebius/cleanup

code cleanup