BinaryOp refactoring