Fix a few whitespace/newline issues