Commenting enhancement