improve comments in fetch_payment