Simplify teams a bit