Whitespace formatting fixes
Whitespace formatting fixes and style