Minor cleanups of whitespace