refactoring and cleanup

1 job for feat/resend_nack in 54 seconds (queued for 9 seconds)
Status Name Job ID Coverage
  Test
passed test #26303
DESY-intern

00:00:54