Refactor scrubbing into class.