Support inline scrubber with test file, some white space fixes.