diff --git a/channeldb/channel_test.go b/channeldb/channel_test.go
index 622de36c..0dabf9a9 100644
--- a/channeldb/channel_test.go
+++ b/channeldb/channel_test.go
@@ -553,7 +553,7 @@ func TestChannelStateTransition(t *testing.T) {
 	commitDiff.Commitment.RemoteBalance += htlcAmt
 	commitDiff.LogUpdates = []LogUpdate{}
 	if err := channel.AppendRemoteCommitChain(commitDiff); err != nil {
-		t.Fatal("unable to add to commit chain: %v", err)
+		t.Fatalf("unable to add to commit chain: %v", err)
 	}
 	if err := channel.AdvanceCommitChainTail(); err != nil {
 		t.Fatalf("unable to append to revocation log: %v", err)
diff --git a/channeldb/db.go b/channeldb/db.go
index f6b45800..f79dc0aa 100644
--- a/channeldb/db.go
+++ b/channeldb/db.go
@@ -442,14 +442,17 @@ func (d *DB) MarkChanFullyClosed(chanPoint *wire.OutPoint) error {
 
 		chanID := b.Bytes()
 
-		closedChanBucket, err := tx.CreateBucketIfNotExists(closedChannelBucket)
+		closedChanBucket, err := tx.CreateBucketIfNotExists(
+			closedChannelBucket,
+		)
 		if err != nil {
 			return err
 		}
 
 		chanSummaryBytes := closedChanBucket.Get(chanID)
 		if chanSummaryBytes == nil {
-			return fmt.Errorf("no closed channel by that chanID found")
+			return fmt.Errorf("no closed channel by that chanID " +
+				"found")
 		}
 
 		chanSummaryReader := bytes.NewReader(chanSummaryBytes)
@@ -472,9 +475,9 @@ func (d *DB) MarkChanFullyClosed(chanPoint *wire.OutPoint) error {
 	})
 }
 
-// syncVersions function is used for safe db version synchronization. It applies
-// migration functions to the current database and recovers the previous
-// state of db if at least one error/panic appeared during migration.
+// syncVersions function is used for safe db version synchronization. It
+// applies migration functions to the current database and recovers the
+// previous state of db if at least one error/panic appeared during migration.
 func (d *DB) syncVersions(versions []version) error {
 	meta, err := d.FetchMeta(nil)
 	if err != nil {
diff --git a/lnwire/message.go b/lnwire/message.go
index 9dc0b6b5..4963eef7 100644
--- a/lnwire/message.go
+++ b/lnwire/message.go
@@ -40,7 +40,7 @@ const (
 	MsgCommitSig                           = 132
 	MsgRevokeAndAck                        = 133
 	MsgUpdateFailMalformedHTLC             = 135
-	MsgChannelReestablish                    = 136
+	MsgChannelReestablish                  = 136
 	MsgUpdateFee                           = 137
 	MsgChannelAnnouncement                 = 256
 	MsgNodeAnnouncement                    = 257