refactor Calculations class