Whitespace and formatting cleanup only

No functionality was changed.