refactored names in Lexer and deleted superfluous Op token type