Updated cleaner
Merge pull request #11 from marcoceppi/better-cleanup

Updated cleaner