diff --git a/cmix/message/bundle.go b/cmix/message/bundle.go
index 887148285243b4eaa96c1d4b3ef2cdd74a137c0f..0c3198e1f4e377e59027ea2ff2cdbd40389e8179 100644
--- a/cmix/message/bundle.go
+++ b/cmix/message/bundle.go
@@ -8,8 +8,8 @@
 package message
 
 import (
-	"gitlab.com/elixxir/client/cmix/rounds"
 	"gitlab.com/elixxir/client/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/cmix/rounds"
 	"gitlab.com/elixxir/primitives/format"
 	"gitlab.com/xx_network/primitives/id"
 )
diff --git a/cmix/nodes/register_test.go b/cmix/nodes/register_test.go
index 6f87c165af189030f5414adc6f61275af3f0add7..d92bfcf29d7940f070e035849eaa1df76e1f4dad 100644
--- a/cmix/nodes/register_test.go
+++ b/cmix/nodes/register_test.go
@@ -88,4 +88,3 @@ func TestRegisterWithNode(t *testing.T) {
 		t.Fatalf("registerWithNode error: %+v", err)
 	}
 }
-
diff --git a/fileTransfer/store/received_test.go b/fileTransfer/store/received_test.go
index 4aa468f84055ed50f6b8272a858697273f20efd3..a6e61d07ee352746add70d81e0b4dffc71493d81 100644
--- a/fileTransfer/store/received_test.go
+++ b/fileTransfer/store/received_test.go
@@ -204,8 +204,8 @@ func TestReceived_save(t *testing.T) {
 	kv := versioned.NewKV(ekv.MakeMemstore())
 	r, _, _ := NewOrLoadReceived(kv)
 	r.transfers = map[ftCrypto.TransferID]*ReceivedTransfer{
-		ftCrypto.TransferID{0}: nil, ftCrypto.TransferID{1}: nil,
-		ftCrypto.TransferID{2}: nil, ftCrypto.TransferID{3}: nil,
+		{0}: nil, {1}: nil,
+		{2}: nil, {3}: nil,
 	}
 
 	err := r.save()
diff --git a/fileTransfer/store/sent_test.go b/fileTransfer/store/sent_test.go
index f07a5996c2ba9844faeeffecaed6c171eecb4851..439261f48d60070183cc43308e823396dd4d634b 100644
--- a/fileTransfer/store/sent_test.go
+++ b/fileTransfer/store/sent_test.go
@@ -225,8 +225,8 @@ func TestSent_save(t *testing.T) {
 	kv := versioned.NewKV(ekv.MakeMemstore())
 	s, _, _ := NewOrLoadSent(kv)
 	s.transfers = map[ftCrypto.TransferID]*SentTransfer{
-		ftCrypto.TransferID{0}: nil, ftCrypto.TransferID{1}: nil,
-		ftCrypto.TransferID{2}: nil, ftCrypto.TransferID{3}: nil,
+		{0}: nil, {1}: nil,
+		{2}: nil, {3}: nil,
 	}
 
 	err := s.save()
diff --git a/ud/lookup_test.go b/ud/lookup_test.go
index 2b168e4a30c3b04e9840225c43b5e1aab039759c..17c4c03edf78384a2a62cadd59a0a763f837af16 100644
--- a/ud/lookup_test.go
+++ b/ud/lookup_test.go
@@ -43,7 +43,7 @@ func TestManager_Lookup(t *testing.T) {
 		DhPubKey: publicKey,
 	}
 
-	contacts := []*Contact{&Contact{
+	contacts := []*Contact{{
 		UserID: expectedContact.ID.Bytes(),
 		PubKey: expectedContact.DhPubKey.Bytes(),
 	}}