Further enhance tokenize.js and remove sketch mark