refactoring order form