Refactor cucumber steps