Group refactor