some cleanup of the code
Merge pull request #9 from ziggyzaggy/master

some cleanup of the code