Lexer already has improved user friendliness