Added some comments, removed json builder for teams