Refactored market order draft creation