Begun simplifing the lexer by removing unnecessary classes.