Did some cleanup
Merge pull request #30 from karo1205/cleanup

Did some cleanup