Refactor another teams assignment (original assignment from rachel-kudrna)