Implement suggestions from review

1 job for asapo_sender_retry in 39 seconds (queued for 22 seconds)