minor refactor on BasicCalculatorMixin