Whitespace fixes and normalization

Whitespace fixes and normalization.