Improvements to cleaner.