Cleaned up order creation process