cleaned up code
added team data