Enhanced refactoring.