general code cleanup
Merge pull request #24 from Hendrixer/code-cleanup

general code cleanup