Fix and yet more whitespace