Cleaner
Let's try this