token string regex minor changes