The beginning of refactoring.