Merge "modify comments to be more accurate"