Refactor step to use helper methods