diff --git a/core/listener.go b/core/listener.go
index 6dd2e7f96..758d86756 100644
--- a/core/listener.go
+++ b/core/listener.go
@@ -205,9 +205,9 @@ func (cl *Listener) handleNewSignedBlock(ctx context.Context, b types.EventDataS
 			Height:   eh.Height(),
 		})
 		if err != nil && !errors.Is(err, context.Canceled) {
-			log.Errorw("listener: broadcasting data hash",
+			"log.Errorw("listener: broadcasting data hash",
 				"height", b.Header.Height,
-				"hash", b.Header.Hash(), "err", err) // TODO: hash or datahash?
+				"data_hash", eh.DataHash.String(), "err", err)"
 		}
 	}
 
diff --git a/core/listener_no_race_test.go b/core/listener_no_race_test.go
index b7d26fba3..96487095f 100644
--- a/core/listener_no_race_test.go
+++ b/core/listener_no_race_test.go
@@ -44,8 +44,8 @@ func TestListenerWithNonEmptyBlocks(t *testing.T) {
 	t.Cleanup(sub.Cancel)
 
 	empty := share.EmptyEDSRoots()
-	// TODO extract 16
-	for i := 0; i < 16; i++ {
+	const numBlocksToFill = 16
+	for i := 0; i < numBlocksToFill; i++ {
 		accounts := cfg.Genesis.Accounts()
 		require.Greater(t, len(accounts), 0)
 		_, err := cctx.FillBlock(16, accounts[0].Name, flags.BroadcastBlock)