Refactored steps for form