Refactor grouping of the comment