Cleanup.
Whitespace and formatting cleanup.