Tech Debt: Refactored code