Comment and formatting fixes.