renamed OPTYPE macro names
removed declaration of operator functions