Cleanup and added some more teams to the team name normalizer