Revamps Parser and Lexer