- Enhanced refactoring.