group refactoring