Whitespace cleanup and reorganization.
[ci skip]