Comment and formatting cleanup.