refactoring of the step actions