Remove uncovered exception
Moved the toString implementation to the Token class
Removed uncovered code
Do not make use of the StringBuffer anymore