Refactoring step