Improved token parsing a little bit more