Improve regex for token