More work on the cleaner