Tech Debt: Still more refactoring