Refactored comment's parsing.   Added parsing for identifiers and keywords.