diff --git a/cmd/server/usergameserver.go b/cmd/server/usergameserver.go
index 12d9f55..0db0857 100644
--- a/cmd/server/usergameserver.go
+++ b/cmd/server/usergameserver.go
@@ -71,20 +71,20 @@ func (ugs *UserGameServer) listen(ctx context.Context, reader func(context.Conte
 			return err
 		}
 
-		if m["party"] == "start" {
+		if startGame := m["party"] == "start"; startGame {
 			if gameState, err := ugs.games.GameState(ctx, ugs.ID); err != nil {
 				return err
 			} else if gameState.Started {
 			} else if err := ugs.games.CreateEventAssignmentRotation(ctx, ugs.ID, "", "", "", 0); err != nil {
 				return err
 			}
-		} else if m["k"] != "" {
+		} else if killOccurred := m["k"] != ""; killOccurred {
 			return fmt.Errorf("not impl: a kill occurred: %+v", m)
-		} else if name := m["name"]; name != "" {
-			if err := ugs.games.UpdateUserName(ctx, ugs.Session.ID, name); err != nil {
+		} else if isRename := m["name"] != ""; isRename {
+			if err := ugs.games.UpdateUserName(ctx, ugs.Session.ID, m["name"]); err != nil {
 				return err
 			}
-		} else if m["again"] == "true" {
+		} else if isRestart := m["again"] == "true"; isRestart {
 			if gameState, err := ugs.games.GameState(ctx, ugs.ID); err != nil {
 				return err
 			} else if gameState.Completed.IsZero() {