Refactor Team string

Staph, #blamebionicbeast

Change-Id: I7465b91d5924ba6b001c610a3e91daeca752212f