Tidy up worldpay payment handler