Refactoring comment processing in lexer, WIP