Tech Debt: Code refactor