[ansi scrubber] minor reorg