Updated tokenizer to remove special character like .?