Refactor calculators to be more opinionated what to compute

Might need some more edge test cases.