Finalized the refactoring with splitting out the pricing calculators by type