Refine the comments according to Anoop's comments.