fixes #7
+ Some extra cleaning