Comment and structure cleanup.