fixes #6
Some extra cleaning