Standardise some whitespace