refactored comment tokenizer