Refactoring Valuation feature.