Whitespace and formatting fixes.