removed unnecessary functions, added keyword
removed opType from Token