re-org the comment lines according to the code-style