More refactoring and technical debt reduction...