Tokenizer will now check for underscore and parenthesis as well