refined tokenization a bit more