Refactor step one