Cleaner improvements