Reorganized normalize/tokenize into one