general code cleanup
Merge pull request #4 from drunkel/master

general code cleanup