Refine some comments and struct