some cleaning
Merge pull request #103 from aaberg/cleanup

some cleaning