More refactoring, enabling a :scrub option