Steps refactoring