Editorial refactoring.