Refactored steps