Pure refactoring.