Whitespace and newline fixes.