cleaner optimization