Keyword refactor, in Lexer, Parser