Steps refactoring
Better arguments names