integrate the 2 type

  typedef std::list<std::string> TC;
  typedef TokenContainer TC;

  eliminate some function that do the same thing.