Cleaner design