Clean up team switch check a bit