* finished refactoring for Calculation Class