Refactored convert team to reduce redundancy and to not rely on id calculations