Correct whitespace issues