refactor of comments