cleanup
Merge pull request #5 from dittertp/master

code cleanup