Tidy up order processing