diff --git a/federationapi/routing/peek.go b/federationapi/routing/peek.go
index a036234ef..8f83cb157 100644
--- a/federationapi/routing/peek.go
+++ b/federationapi/routing/peek.go
@@ -18,8 +18,8 @@ import (
 	"net/http"
 
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
-	"github.com/matrix-org/dendrite/setup/config"
 	"github.com/matrix-org/dendrite/roomserver/api"
+	"github.com/matrix-org/dendrite/setup/config"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/util"
 )
diff --git a/federationsender/storage/postgres/storage.go b/federationsender/storage/postgres/storage.go
index 4758359ef..b9827ca19 100644
--- a/federationsender/storage/postgres/storage.go
+++ b/federationsender/storage/postgres/storage.go
@@ -74,7 +74,7 @@ func NewDatabase(dbProperties *config.DatabaseOptions, cache caching.FederationS
 	}
 	d.Database = shared.Database{
 		DB:                            d.db,
-    Cache:                         cache,
+		Cache:                         cache,
 		Writer:                        d.writer,
 		FederationSenderJoinedHosts:   joinedHosts,
 		FederationSenderQueuePDUs:     queuePDUs,
diff --git a/federationsender/storage/shared/storage.go b/federationsender/storage/shared/storage.go
index 08ef7be67..4c9490424 100644
--- a/federationsender/storage/shared/storage.go
+++ b/federationsender/storage/shared/storage.go
@@ -28,7 +28,7 @@ import (
 
 type Database struct {
 	DB                            *sql.DB
- 	Cache                         caching.FederationSenderCache
+	Cache                         caching.FederationSenderCache
 	Writer                        sqlutil.Writer
 	FederationSenderQueuePDUs     tables.FederationSenderQueuePDUs
 	FederationSenderQueueEDUs     tables.FederationSenderQueueEDUs
diff --git a/roomserver/internal/api.go b/roomserver/internal/api.go
index 06621146c..5d4e8cab5 100644
--- a/roomserver/internal/api.go
+++ b/roomserver/internal/api.go
@@ -99,7 +99,7 @@ func (r *RoomserverInternalAPI) SetFederationSenderAPI(fsAPI fsAPI.FederationSen
 	r.InboundPeeker = &perform.InboundPeeker{
 		DB:      r.DB,
 		Inputer: r.Inputer,
-  }
+	}
 	r.Unpeeker = &perform.Unpeeker{
 		ServerName: r.Cfg.Matrix.ServerName,
 		Cfg:        r.Cfg,
diff --git a/roomserver/internal/perform/perform_peek.go b/roomserver/internal/perform/perform_peek.go
index ea7c72946..443276cd7 100644
--- a/roomserver/internal/perform/perform_peek.go
+++ b/roomserver/internal/perform/perform_peek.go
@@ -165,7 +165,7 @@ func (r *Peeker) performPeekRoomByID(
 			ServerNames: req.ServerNames,   // the servers to try peeking via
 		}
 		fedRes := fsAPI.PerformOutboundPeekResponse{}
-		r.FSAPI.PerformOutboundPeek(ctx, &fedReq, &fedRes)
+		_ = r.FSAPI.PerformOutboundPeek(ctx, &fedReq, &fedRes)
 		if fedRes.LastError != nil {
 			return "", &api.PerformError{
 				Code:       api.PerformErrRemote,
diff --git a/roomserver/inthttp/client.go b/roomserver/inthttp/client.go
index c03ae90c8..5060530a4 100644
--- a/roomserver/inthttp/client.go
+++ b/roomserver/inthttp/client.go
@@ -27,13 +27,13 @@ const (
 	// Perform operations
 	RoomserverPerformInvitePath      = "/roomserver/performInvite"
 	RoomserverPerformPeekPath        = "/roomserver/performPeek"
-  RoomserverPerformUnpeekPath      = "/roomserver/performUnpeek"
+	RoomserverPerformUnpeekPath      = "/roomserver/performUnpeek"
 	RoomserverPerformJoinPath        = "/roomserver/performJoin"
 	RoomserverPerformLeavePath       = "/roomserver/performLeave"
 	RoomserverPerformBackfillPath    = "/roomserver/performBackfill"
 	RoomserverPerformPublishPath     = "/roomserver/performPublish"
 	RoomserverPerformInboundPeekPath = "/roomserver/performInboundPeek"
-  RoomserverPerformForgetPath   = "/roomserver/performForget"
+	RoomserverPerformForgetPath      = "/roomserver/performForget"
 
 	// Query operations
 	RoomserverQueryLatestEventsAndStatePath    = "/roomserver/queryLatestEventsAndState"