Merge pull request #26 from crawln45/master

code cleanup