Refactor group.go