diff --git a/app/cli/main.go b/app/cli/main.go
index fc3f4a3..ec12f1e 100644
--- a/app/cli/main.go
+++ b/app/cli/main.go
@@ -531,11 +531,11 @@ func main() {
 			}
 		case "/import-group":
 			if len(commands) == 2 {
-				groupId, err := peer.ImportGroup(commands[1])
+				groupID, err := peer.ImportGroup(commands[1])
 				if err != nil {
 					fmt.Printf("Error importing group: %v\n", err)
 				} else {
-					fmt.Printf("Imported group: %s\n", groupId)
+					fmt.Printf("Imported group: %s\n", groupID)
 				}
 			} else {
 				fmt.Printf("%v", commands)
diff --git a/server/server.go b/server/server.go
index fc2138a..11fd3f4 100644
--- a/server/server.go
+++ b/server/server.go
@@ -8,8 +8,8 @@ import (
 	"cwtch.im/cwtch/storage"
 	"git.openprivacy.ca/openprivacy/libricochet-go/application"
 	"git.openprivacy.ca/openprivacy/libricochet-go/channels"
-	"log"
 	"git.openprivacy.ca/openprivacy/libricochet-go/utils"
+	"log"
 )
 
 // Server encapsulates a complete, compliant Cwtch server.