tidying up of payment process