improved token regex