refactor some comments