AI-driven refactoring

CHAT