Initial refactoring of binary operations
Preparing for the next release