Improve script token split