fix and refine comments