clean some comments, order