Tidied teams mappings.
blah