group: refactoring group