did some code cleanup
Merge pull request #1 from lemedli/master

did some code cleanup