Sortof extract conditional cleaner into it's class