refactoring of scrubbing (handler pattern)