Refactor BinaryOperationFormatter a bit