Cleaner logic placement