Removed @ pointers from tokenizer