Removed BinaryOperator
Formatting