Whitespace and formatting fixes