refine comments and decriptions