Re-indented lexer and lexer part in the report