order form refractoring