diff --git a/server/rpc/rpcserver.go b/server/rpc/rpcserver.go
index c6769139c..875454dbe 100644
--- a/server/rpc/rpcserver.go
+++ b/server/rpc/rpcserver.go
@@ -4213,7 +4213,7 @@ func NewRPCServer(
 		gbtWorkState:           newGbtWorkState(cfg.TimeSource),
 		helpCacher:             newHelpCacher(),
 		requestProcessShutdown: make(chan struct{}),
-		quit: make(chan int),
+		quit:                   make(chan int),
 	}
 	if config.MainConfig().RPCUser != "" && config.MainConfig().RPCPass != "" {
 		login := config.MainConfig().RPCUser + ":" + config.MainConfig().RPCPass
diff --git a/util/bech32/internal_test.go b/util/bech32/internal_test.go
index 79a3678ef..007b7ac9d 100644
--- a/util/bech32/internal_test.go
+++ b/util/bech32/internal_test.go
@@ -21,12 +21,12 @@ func TestBech32(t *testing.T) {
 		{"::qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq40ku0e3z", true},
 		{"split:checkupstagehandshakeupstreamerranterredcaperred3za27wc5", true},
 		{"aaa:bbb", false}, // too short
-		{"split:checkupstagehandshakeupstreamerranterredCaperred3za27wc5", false},                              // mixed uppercase and lowercase
-		{"split:checkupstagehandshakeupstreamerranterredcaperred3za28wc5", false},                              // invalid checksum
-		{"s lit:checkupstagehandshakeupstreamerranterredcaperred3za27wc5", false},                              // invalid character (space) in prefix
-		{"spl" + string(127) + "t:checkupstagehandshakeupstreamerranterredcaperred3za27wc5", false},            // invalid character (DEL) in prefix
-		{"split:cheosgds2s3c", false},                                                                          // invalid character (o) in data part
-		{"split:te5peu7", false},                                                                               // too short data part
+		{"split:checkupstagehandshakeupstreamerranterredCaperred3za27wc5", false},                   // mixed uppercase and lowercase
+		{"split:checkupstagehandshakeupstreamerranterredcaperred3za28wc5", false},                   // invalid checksum
+		{"s lit:checkupstagehandshakeupstreamerranterredcaperred3za27wc5", false},                   // invalid character (space) in prefix
+		{"spl" + string(127) + "t:checkupstagehandshakeupstreamerranterredcaperred3za27wc5", false}, // invalid character (DEL) in prefix
+		{"split:cheosgds2s3c", false}, // invalid character (o) in data part
+		{"split:te5peu7", false},      // too short data part
 		{":checkupstagehandshakeupstreamerranterredcaperred3za27wc5", false},                                   // empty prefix
 		{"::qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq40ku0e3z", false}, // too long
 		{"bitcoincash:qr6m7j9njldwwzlg9v7v53unlr4jkmx6eylep8ekg2", true},
diff --git a/util/certgen.go b/util/certgen.go
index 3ffee65a4..6643aa0a5 100644
--- a/util/certgen.go
+++ b/util/certgen.go
@@ -110,7 +110,7 @@ func NewTLSCertPair(organization string, validUntil time.Time, extraHosts []stri
 
 		KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature |
 			x509.KeyUsageCertSign,
-		IsCA: true, // so can sign self.
+		IsCA:                  true, // so can sign self.
 		BasicConstraintsValid: true,
 
 		DNSNames:    dnsNames,