tokenize() and split() methods refactored