Fix some whitespace issues