tidy/Improved the lexer code #19