Refactor order form