Cleaner logic