Whitespace & formatting cleanup.