edit comments to fit validation