Removed "private" parameters from tokenize and parse