Whitespace formatting fixes and style