improved readability of parser and lexer