Code cleanup
Merge pull request #44 from dcz/master

Code cleanup