refactored tokenizer specs for readability