Automated cleanup and refactoring...