add Token class
remove unused field
add Scaladoc comments