code cleanup
Merge pull request #9 from paradoxe/master

Code cleanup