Refactoring step.