Made the thing cleaner