Tech Debt: code cleanup