Refactoring BinaryCalculators