diff --git a/src/sysprof/sysprof-greeter.c b/src/sysprof/sysprof-greeter.c
index 766610b5..aa4e64e9 100644
--- a/src/sysprof/sysprof-greeter.c
+++ b/src/sysprof/sysprof-greeter.c
@@ -205,25 +205,24 @@ sysprof_greeter_create_profiler (SysprofGreeter  *self,
   g_autoptr(GFile) dir = NULL;
   GtkStringObject *strobj;
   const char *str;
-  guint envvars_n_items;
-  g_autoptr(GStrvBuilder) envvars_builder = NULL;
-  g_autofree GStrv envvars_list = NULL;
 
   g_assert (SYSPROF_IS_GREETER (self));
   
-  if ((envvars_n_items = g_list_model_get_n_items (G_LIST_MODEL (self->envvars))))
-  {
-    envvars_builder = g_strv_builder_new ();
-    for (guint i = 0; i < envvars_n_items; i++)
-      {
-        strobj = g_list_model_get_item (G_LIST_MODEL (self->envvars), i);
-        g_strv_builder_add (envvars_builder, gtk_string_object_get_string (strobj));
-      }
-    envvars_list = g_strv_builder_end (envvars_builder);
-    g_object_set (self->recording_template,
-                  "environ", envvars_list,
-                  NULL);
-  }
+  if (g_list_model_get_n_items (G_LIST_MODEL (self->envvars)))
+    {
+      g_autoptr(GStrvBuilder) envvars_builder = g_strv_builder_new ();;
+      g_auto(GStrv) envvars_list = NULL;
+
+      for (guint i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->envvars)); i++)
+        {
+          strobj = g_list_model_get_item (G_LIST_MODEL (self->envvars), i);
+          g_strv_builder_add (envvars_builder, gtk_string_object_get_string (strobj));
+        }
+      envvars_list = g_strv_builder_end (envvars_builder);
+      g_object_set (self->recording_template,
+                    "environ", envvars_list,
+                    NULL);
+    }
 
   if ((strobj = adw_combo_row_get_selected_item (self->power_combo)) &&
       (str = gtk_string_object_get_string (strobj)))
@@ -632,9 +631,7 @@ sysprof_greeter_init (SysprofGreeter *self)
       if (environ)
         {
           for (guint i = 0; environ[i]; i++)
-            {
-              gtk_string_list_append (self->envvars, environ[i]);
-            }
+            gtk_string_list_append (self->envvars, environ[i]);            
         }
     }