fixed token rational extraction
cleanup token.cc