Outline refactoring.