Mapping for FixWhitespace, and also fix whitespace here