[Expenditure Tracking] Refactored