dclass: Initial revision of Lexer