Important refactoring.