Parsers code clean-up + digits suport for Keyword