some cleaning
Merge pull request #3 from cpoliwoda/master

some cleaning