More whitespace and formatting cleanup.