Change to use Tokenizer and not strtok