Refine some comments