Refactoring steps