Whitespace and formatting fixes

Whitespace and formatting fixes

Whitespace and formatting fixes