Updated parser and tokenizer to N.W.'s style