Refactor step parsing from request