Refactor another teams assignment