Whitespace and newline fixes