Cleanup getTeam, add map to match, fix typo in worker