diff --git a/internal/blocktx/health_check_test.go b/internal/blocktx/health_check_test.go
index 5d9696b66..8a4fdf749 100644
--- a/internal/blocktx/health_check_test.go
+++ b/internal/blocktx/health_check_test.go
@@ -71,7 +71,7 @@ func TestCheck(t *testing.T) {
 			peerMq := &better_p2p_mocks.PeerIMock{}
 			peerMq.NetworkFunc = func() wire.BitcoinNet { return wire.TestNet }
 			peerMq.ConnectedFunc = func() bool { return false }
-			pm.AddPeer(peerMq)
+			_ = pm.AddPeer(peerMq)
 
 			sut, err := blocktx.NewServer("", 0, logger, storeMock, pm, 0, nil)
 			require.NoError(t, err)
@@ -140,7 +140,7 @@ func TestWatch(t *testing.T) {
 			peerMq := &better_p2p_mocks.PeerIMock{}
 			peerMq.NetworkFunc = func() wire.BitcoinNet { return wire.TestNet }
 			peerMq.ConnectedFunc = func() bool { return false }
-			pm.AddPeer(peerMq)
+			_ = pm.AddPeer(peerMq)
 
 			sut, err := blocktx.NewServer("", 0, logger, storeMock, pm, 0, nil)
 			require.NoError(t, err)
diff --git a/internal/blocktx/p2p/message_handler.go b/internal/blocktx/p2p/message_handler.go
index 820f94923..03bdbdab4 100644
--- a/internal/blocktx/p2p/message_handler.go
+++ b/internal/blocktx/p2p/message_handler.go
@@ -62,6 +62,6 @@ func (h *PeerMsgHandler) OnReceive(wireMsg wire.Message, peer better_p2p.PeerI)
 	}
 }
 
-func (h *PeerMsgHandler) OnSend(msg wire.Message, peer better_p2p.PeerI) {
+func (h *PeerMsgHandler) OnSend(_ wire.Message, _ better_p2p.PeerI) {
 	// ignore
 }
diff --git a/internal/metamorph/p2p/message_handler.go b/internal/metamorph/p2p/message_handler.go
index cdf32220d..58b979a6c 100644
--- a/internal/metamorph/p2p/message_handler.go
+++ b/internal/metamorph/p2p/message_handler.go
@@ -61,7 +61,6 @@ func (h *PeerMsgHandler) OnReceive(wireMsg wire.Message, peer better_p2p.PeerI)
 				}:
 				default: // Ensure that writing to channel is non-blocking
 				}
-
 			}
 		}
 
@@ -139,7 +138,6 @@ func (h *PeerMsgHandler) OnReceive(wireMsg wire.Message, peer better_p2p.PeerI)
 func (h *PeerMsgHandler) OnSend(wireMsg wire.Message, peer better_p2p.PeerI) {
 	cmd := wireMsg.Command()
 	switch cmd {
-
 	case wire.CmdTx:
 		msg, ok := wireMsg.(*wire.MsgTx)
 		if !ok {
diff --git a/internal/metamorph/processor.go b/internal/metamorph/processor.go
index 90a49c106..4db488aa9 100644
--- a/internal/metamorph/processor.go
+++ b/internal/metamorph/processor.go
@@ -626,7 +626,6 @@ func (p *Processor) StartProcessExpiredTransactions() {
 							requested++
 							//continue
 						} else {
-
 							p.logger.Debug("Re-announcing expired tx", slog.String("hash", tx.Hash.String()))
 							toAnnounce = append(toAnnounce, tx.Hash)
 							//	peers := p.pm.AnnounceTransaction(tx.Hash, nil)
@@ -658,7 +657,6 @@ func (p *Processor) StartProcessExpiredTransactions() {
 							p.logger.Warn("transaction was not announced to any peer during rebroadcast")
 						}
 					}
-
 				}
 
 				if announced > 0 || requested > 0 {