tokenize properly