light refactoring of scenario steps