diff --git a/src/preferences.ui b/src/preferences.ui
index 17bcdea7..14883826 100644
--- a/src/preferences.ui
+++ b/src/preferences.ui
@@ -2164,7 +2164,7 @@
         <child>
           <object class="GtkModelButton">
             <property name="visible">True</property>
-            <property name="action-name">win.make-default</property>
+            <property name="action-name">win.set-as-default</property>
             <property name="text" translatable="yes">Set as default</property>
           </object>
         </child>
diff --git a/src/profile-editor.c b/src/profile-editor.c
index 2259e282..de128e19 100644
--- a/src/profile-editor.c
+++ b/src/profile-editor.c
@@ -862,17 +862,6 @@ monospace_filter (const PangoFontFamily *family,
   return pango_font_family_is_monospace ((PangoFontFamily *) family);
 }
 
-/* Called once per Preferences window, to destroy stuff that doesn't depend on the profile being edited */
-void
-profile_prefs_destroy (void)
-{
-  profile_prefs_signal_handlers_disconnect_all ();
-  profile_prefs_settings_unbind_all ();
-
-  g_array_free (the_pref_data->profile_signals, TRUE);
-  g_array_free (the_pref_data->profile_bindings, TRUE);
-}
-
 /* Called once per Preferences window, to initialize stuff that doesn't depend on the profile being edited */
 void
 profile_prefs_init (void)
@@ -1324,3 +1313,13 @@ profile_prefs_load (const char *uuid, GSettings *profile)
                                "active-id",
                                G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
 }
+
+/* Called once per Preferences window, to destroy stuff that doesn't depend on the profile being edited */
+void
+profile_prefs_destroy (void)
+{
+  profile_prefs_unload ();
+
+  g_array_free (the_pref_data->profile_signals, TRUE);
+  g_array_free (the_pref_data->profile_bindings, TRUE);
+}
diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c
index d1cc8039..07d8b368 100644
--- a/src/terminal-prefs.c
+++ b/src/terminal-prefs.c
@@ -37,7 +37,9 @@
 #include "terminal-profiles-list.h"
 #include "terminal-libgsystem.h"
 
-PrefData *the_pref_data = NULL;
+PrefData *the_pref_data = NULL;  /* global */
+
+/* Bottom */
 
 static void
 prefs_dialog_help_button_clicked_cb (GtkWidget *button,
@@ -100,7 +102,7 @@ listbox_update (GtkListBox *box)
     gtk_stack_set_visible_child_name (stack, is_selected_profile ? "button" : "placeholder");
     if (is_selected_profile) {
       g_simple_action_set_enabled (lookup_action (GTK_WINDOW (the_pref_data->dialog), "delete"), !is_default_profile);
-      g_simple_action_set_enabled (lookup_action (GTK_WINDOW (the_pref_data->dialog), "make-default"), !is_default_profile);
+      g_simple_action_set_enabled (lookup_action (GTK_WINDOW (the_pref_data->dialog), "set-as-default"), !is_default_profile);
 
       GtkPopover *popover_menu = GTK_POPOVER (gtk_builder_get_object (the_pref_data->builder, "popover-menu"));
       button = g_object_get_data (G_OBJECT (row), "popover-button");
@@ -133,6 +135,7 @@ update_window_title (void)
   gtk_window_set_title (GTK_WINDOW (the_pref_data->dialog), title);
 }
 
+/* A new entry is selected in the sidebar */
 static void
 listbox_row_selected_cb (GtkListBox *box,
                          GtkListBoxRow *row,
@@ -165,8 +168,6 @@ listbox_row_selected_cb (GtkListBox *box,
   update_window_title ();
 }
 
-/* Profiles tab */
-
 /* A profile's name changed, perhaps externally */
 static void
 profile_name_changed_cb (GtkLabel      *label,
@@ -250,9 +251,9 @@ profile_delete_now (const char *dummy)
 
 /* "Set as default" selected. Do it now without asking for confirmation. */
 static void
-profile_make_default_cb (GSimpleAction *simple,
-                         GVariant      *parameter,
-                         gpointer       user_data)
+profile_set_as_default_cb (GSimpleAction *simple,
+                           GVariant      *parameter,
+                           gpointer       user_data)
 {
   if (the_pref_data->selected_profile_uuid == NULL)
     return;
@@ -348,7 +349,6 @@ profile_popup_dialog (GtkWidget *relative_to,
   GtkButton *ok = GTK_BUTTON (gtk_builder_get_object (the_pref_data->builder, "popover-dialog-ok"));
   gtk_button_set_label (ok, ok_text);
   GtkButton *cancel = GTK_BUTTON (gtk_builder_get_object (the_pref_data->builder, "popover-dialog-cancel"));
-
   GtkPopover *popover_dialog = GTK_POPOVER (gtk_builder_get_object (the_pref_data->builder, "popover-dialog"));
 
   g_signal_connect (ok, "clicked", G_CALLBACK (popover_dialog_ok_clicked_cb), fn);
@@ -387,7 +387,7 @@ profile_clone_cb (GSimpleAction *simple,
                   GVariant      *parameter,
                   gpointer       user_data)
 {
-  const char *name = g_settings_get_string (the_pref_data->selected_profile, TERMINAL_PROFILE_VISIBLE_NAME_KEY);
+  gs_free char *name = g_settings_get_string (the_pref_data->selected_profile, TERMINAL_PROFILE_VISIBLE_NAME_KEY);
 
   gs_free char *label = g_strdup_printf (_("Enter name for new profile based on “%s”:"), name);
   gs_free char *clone_name = g_strdup_printf (_("%s (Copy)"), name);
@@ -409,7 +409,7 @@ profile_rename_cb (GSimpleAction *simple,
   if (the_pref_data->selected_profile == NULL)
     return;
 
-  const char *name = g_settings_get_string (the_pref_data->selected_profile, TERMINAL_PROFILE_VISIBLE_NAME_KEY);
+  gs_free char *name = g_settings_get_string (the_pref_data->selected_profile, TERMINAL_PROFILE_VISIBLE_NAME_KEY);
 
   gs_free char *label = g_strdup_printf (_("Enter new name for profile “%s”:"), name);
 
@@ -430,7 +430,7 @@ profile_delete_cb (GSimpleAction *simple,
   if (the_pref_data->selected_profile == NULL)
     return;
 
-  const char *name = g_settings_get_string (the_pref_data->selected_profile, TERMINAL_PROFILE_VISIBLE_NAME_KEY);
+  gs_free char *name = g_settings_get_string (the_pref_data->selected_profile, TERMINAL_PROFILE_VISIBLE_NAME_KEY);
 
   gs_free char *label = g_strdup_printf (_("Really delete profile “%s”?"), name);
 
@@ -737,7 +737,6 @@ prefs_dialog_destroy_cb (GtkWidget *widget,
 
   g_object_unref (data->builder);
   g_free (data->selected_profile_uuid);
-
   g_free (data);
 }
 
@@ -755,10 +754,10 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
   GSettings *settings;
 
   const GActionEntry action_entries[] = {
-    { "clone",        profile_clone_cb,        NULL, NULL, NULL },
-    { "rename",       profile_rename_cb,       NULL, NULL, NULL },
-    { "delete",       profile_delete_cb,       NULL, NULL, NULL },
-    { "make-default", profile_make_default_cb, NULL, NULL, NULL },
+    { "clone",          profile_clone_cb,          NULL, NULL, NULL },
+    { "rename",         profile_rename_cb,         NULL, NULL, NULL },
+    { "delete",         profile_delete_cb,         NULL, NULL, NULL },
+    { "set-as-default", profile_set_as_default_cb, NULL, NULL, NULL },
   };
 
   if (the_pref_data != NULL)
@@ -804,7 +803,7 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
   gtk_list_box_set_header_func (GTK_LIST_BOX (data->listbox),
                                 listboxrow_update_header,
                                 NULL,
-                                NULL /* destroy! */);
+                                NULL);
   g_signal_connect (data->listbox, "row-selected", G_CALLBACK (listbox_row_selected_cb), data->stack);
   gtk_list_box_set_sort_func (data->listbox, listboxrow_compare_cb, NULL, NULL);
 #if !GTK_CHECK_VERSION (3, 22, 27)
@@ -860,21 +859,22 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
   gtk_widget_set_visible (new_terminal_mode_combo, FALSE);
 #endif
 
-  /* Shortcuts page */
-
   g_settings_bind (settings,
                    TERMINAL_SETTING_ENABLE_MNEMONICS_KEY,
                    disable_mnemonics_button,
                    "active",
                    G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
   g_settings_bind (settings,
-                   TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY,
-                   disable_shortcuts_button,
+                   TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY,
+                   disable_menu_accel_button,
                    "active",
                    G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
+
+  /* Shortcuts page */
+
   g_settings_bind (settings,
-                   TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY,
-                   disable_menu_accel_button,
+                   TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY,
+                   disable_shortcuts_button,
                    "active",
                    G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
 
@@ -892,7 +892,6 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
   g_signal_connect (close_button, "clicked", G_CALLBACK (prefs_dialog_close_button_clicked_cb), data);
   g_signal_connect (help_button, "clicked", G_CALLBACK (prefs_dialog_help_button_clicked_cb), data);
   g_signal_connect (dialog, "destroy", G_CALLBACK (prefs_dialog_destroy_cb), data);
-  gtk_window_set_default_size (GTK_WINDOW (dialog), -1, 350);
 
   g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer *) &the_pref_data);
 
diff --git a/src/terminal-prefs.h b/src/terminal-prefs.h
index b9fce356..ecb4129f 100644
--- a/src/terminal-prefs.h
+++ b/src/terminal-prefs.h
@@ -24,30 +24,29 @@
 
 G_BEGIN_DECLS
 
-// FIXME move back to the .c file if profile-editor.c is also merged there,
-// also remove the profiles-list.h incude above.
-// FIXME PrefData is a very bad name, rename to PrefsDialog maybe?
+/* FIXME move back to the .c file if profile-editor.c is also merged there,
+ * also remove the terminal-profiles-list.h incude above. */
+/* FIXME PrefData is a very bad name, rename to PrefsDialog maybe? */
+
 /* Everything about a preferences dialog */
 typedef struct {
   TerminalSettingsList *profiles_list;
+
   GSettings *selected_profile;
-  char *selected_profile_uuid;  /* a copy thereof, to survive changes to profiles_list */
   GtkListBoxRow *selected_list_box_row;
-  GtkListBox *listbox;
-  GtkWidget *stack;
-
-  GtkWidget *dialog;
-  GtkWindow *parent;
+  char *selected_profile_uuid;  /* a copy thereof, to survive changes to profiles_list */
 
   GtkBuilder *builder;
-
+  GtkWidget *dialog;
+  GtkListBox *listbox;
   GtkWidget *new_profile_button;
+  GtkWidget *stack;
 
   GArray *profile_signals;
   GArray *profile_bindings;
 } PrefData;
 
-extern PrefData *the_pref_data;  // global?
+extern PrefData *the_pref_data;  /* global */
 
 void terminal_prefs_show_preferences (GSettings *profile, const char *widget_name);
 
