Comment and style cleanup.