more tidy up of payments