Refactor place order