Refactor group.