Refactor variables for groupManager