Run uncrustify

Closes: #1870
Approved by: alexlarsson

81 files changed, 3745 insertions, 3456 deletions

diff --git a/app/flatpak-builtins-add-remote.c b/app/flatpak-builtins-add-remote.c
index 65505019..54a4e7c2 100644
--- a/app/flatpak-builtins-add-remote.c
+++ b/app/flatpak-builtins-add-remote.c
@@ -194,7 +194,7 @@ get_config_from_opts (FlatpakDir *dir, const char *remote_name, gboolean *change
 
 static void
 load_options (const char *filename,
-              GBytes **gpg_data)
+              GBytes    **gpg_data)
 {
   g_autoptr(GError) error = NULL;
   g_autoptr(GKeyFile) keyfile = g_key_file_new ();
@@ -349,7 +349,7 @@ flatpak_builtin_add_remote (int argc, char **argv,
   if (remotes == NULL)
     return FALSE;
 
-  if (g_strv_contains ((const char **)remotes, remote_name))
+  if (g_strv_contains ((const char **) remotes, remote_name))
     {
       if (opt_if_not_exists)
         return TRUE; /* Do nothing */
diff --git a/app/flatpak-builtins-build-bundle.c b/app/flatpak-builtins-build-bundle.c
index c0ce3c84..fb636fb6 100644
--- a/app/flatpak-builtins-build-bundle.c
+++ b/app/flatpak-builtins-build-bundle.c
@@ -164,12 +164,12 @@ typedef void (*IterateBundleIconsCallback) (const char *icon_size_name,
                                             gpointer    user_data);
 
 static gboolean
-iterate_bundle_icons (GFile                      *root,
-                      const char                 *name,
-                      IterateBundleIconsCallback  callback,
-                      gpointer                    user_data,
-                      GCancellable               *cancellable,
-                      GError                    **error)
+iterate_bundle_icons (GFile                     *root,
+                      const char                *name,
+                      IterateBundleIconsCallback callback,
+                      gpointer                   user_data,
+                      GCancellable              *cancellable,
+                      GError                   **error)
 {
   g_autoptr(GFile) icons_dir =
     g_file_resolve_relative_path (root,
diff --git a/app/flatpak-builtins-build-commit-from.c b/app/flatpak-builtins-build-commit-from.c
index 88f4eb39..fd3e90eb 100644
--- a/app/flatpak-builtins-build-commit-from.c
+++ b/app/flatpak-builtins-build-commit-from.c
@@ -114,11 +114,12 @@ _ostree_get_relative_static_delta_path (const char *from,
 
 static GVariant *
 new_bytearray (const guchar *data,
-               gsize len)
+               gsize         len)
 {
   gpointer data_copy = g_memdup (data, len);
   GVariant *ret = g_variant_new_from_data (G_VARIANT_TYPE ("ay"), data_copy,
                                            len, FALSE, g_free, data_copy);
+
   return ret;
 }
 
@@ -127,9 +128,9 @@ rewrite_delta (OstreeRepo *src_repo,
                const char *src_commit,
                OstreeRepo *dst_repo,
                const char *dst_commit,
-               GVariant *dst_commitv,
+               GVariant   *dst_commitv,
                const char *from,
-               GError **error)
+               GError    **error)
 {
   g_autoptr(GFile) src_delta_file = NULL;
   g_autoptr(GFile) dst_delta_file = NULL;
@@ -178,7 +179,7 @@ rewrite_delta (OstreeRepo *src_repo,
 
   g_variant_builder_add_value (&superblock_builder, g_variant_dict_end (&dst_metadata_dict));
   g_variant_builder_add_value (&superblock_builder, g_variant_get_child_value (src_superblock, 1)); /* timestamp */
-  g_variant_builder_add_value (&superblock_builder, from ? ostree_checksum_to_bytes_v (from) : new_bytearray ((guchar *)"", 0));
+  g_variant_builder_add_value (&superblock_builder, from ? ostree_checksum_to_bytes_v (from) : new_bytearray ((guchar *) "", 0));
   g_variant_builder_add_value (&superblock_builder, ostree_checksum_to_bytes_v (dst_commit));
   g_variant_builder_add_value (&superblock_builder, dst_commitv);
   g_variant_builder_add_value (&superblock_builder, src_recurse);
@@ -244,7 +245,7 @@ flatpak_builtin_build_commit_from (int argc, char **argv, GCancellable *cancella
 
   dst_repo_arg = argv[1];
 
-  dst_refs = (const char **)argv + 2;
+  dst_refs = (const char **) argv + 2;
   n_dst_refs = argc - 2;
 
   if (opt_src_repo == NULL && n_dst_refs != 1)
@@ -304,7 +305,7 @@ flatpak_builtin_build_commit_from (int argc, char **argv, GCancellable *cancella
                                       cancellable, error))
             return FALSE;
 
-          keys = (const char **)g_hash_table_get_keys_as_array (all_src_refs, NULL);
+          keys = (const char **) g_hash_table_get_keys_as_array (all_src_refs, NULL);
 
           for (i = 0; keys[i] != NULL; i++)
             {
@@ -313,7 +314,7 @@ flatpak_builtin_build_commit_from (int argc, char **argv, GCancellable *cancella
                 g_ptr_array_add (src_refs, g_strdup (keys[i]));
             }
           n_dst_refs = src_refs->len;
-          dst_refs = (const char **)src_refs->pdata;
+          dst_refs = (const char **) src_refs->pdata;
         }
       else
         {
@@ -353,7 +354,7 @@ flatpak_builtin_build_commit_from (int argc, char **argv, GCancellable *cancella
       g_variant_builder_add (&builder, "{s@v}", "flags",
                              g_variant_new_variant (g_variant_new_int32 (pullflags)));
       g_variant_builder_add (&builder, "{s@v}", "refs",
-                             g_variant_new_variant (g_variant_new_strv ((const char *const*) resolved_src_refs->pdata,
+                             g_variant_new_variant (g_variant_new_strv ((const char * const *) resolved_src_refs->pdata,
                                                                         resolved_src_refs->len)));
       g_variant_builder_add (&builder, "{s@v}", "depth",
                              g_variant_new_variant (g_variant_new_int32 (0)));
@@ -380,7 +381,7 @@ flatpak_builtin_build_commit_from (int argc, char **argv, GCancellable *cancella
   if (transaction == NULL)
     return FALSE;
 
-  for (i = 0; i < resolved_src_refs->len; i ++)
+  for (i = 0; i < resolved_src_refs->len; i++)
     {
       const char *dst_ref = dst_refs[i];
       const char *resolved_ref = g_ptr_array_index (resolved_src_refs, i);
@@ -434,10 +435,10 @@ flatpak_builtin_build_commit_from (int argc, char **argv, GCancellable *cancella
 
       g_variant_get_child (src_commitv, 3, "s", &subject);
       if (opt_subject)
-        subject = (const char *)opt_subject;
+        subject = (const char *) opt_subject;
       g_variant_get_child (src_commitv, 4, "s", &body);
       if (opt_body)
-        body = (const char *)opt_body;
+        body = (const char *) opt_body;
 
       dst_collection_id = ostree_repo_get_collection_id (dst_repo);
 
diff --git a/app/flatpak-builtins-build-export.c b/app/flatpak-builtins-build-export.c
index 4a0384e9..7acca3fd 100644
--- a/app/flatpak-builtins-build-export.c
+++ b/app/flatpak-builtins-build-export.c
@@ -180,7 +180,7 @@ commit_filter (OstreeRepo *repo,
    * case. So, we canonicalize the mode to writable only by the user,
    * readable to all, and executable for all for directories and
    * files that the user can execute.
-  */
+   */
   mode = g_file_info_get_attribute_uint32 (file_info, "unix::mode");
   if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)
     mode = 0755 | S_IFDIR;
@@ -266,26 +266,28 @@ find_file_in_tree (GFile *base, const char *filename)
   if (!enumerator)
     return FALSE;
 
-  do {
-    g_autoptr(GFileInfo) info = g_file_enumerator_next_file (enumerator, NULL, NULL);
-    GFileType type;
-    const char *name;
+  do
+    {
+      g_autoptr(GFileInfo) info = g_file_enumerator_next_file (enumerator, NULL, NULL);
+      GFileType type;
+      const char *name;
 
-    if (!info)
-      return FALSE;
+      if (!info)
+        return FALSE;
 
-    type = g_file_info_get_file_type (info);
-    name = g_file_info_get_name (info);
+      type = g_file_info_get_file_type (info);
+      name = g_file_info_get_name (info);
 
-    if (type == G_FILE_TYPE_REGULAR && strcmp (name, filename) == 0)
-      return TRUE;
-    else if (type == G_FILE_TYPE_DIRECTORY)
-      {
-        g_autoptr(GFile) dir = g_file_get_child (base, name);
-        if (find_file_in_tree (dir, filename))
-          return TRUE;
-      }
-  } while (1);
+      if (type == G_FILE_TYPE_REGULAR && strcmp (name, filename) == 0)
+        return TRUE;
+      else if (type == G_FILE_TYPE_DIRECTORY)
+        {
+          g_autoptr(GFile) dir = g_file_get_child (base, name);
+          if (find_file_in_tree (dir, filename))
+            return TRUE;
+        }
+    }
+  while (1);
 
   return FALSE;
 }
@@ -309,15 +311,16 @@ convert_app_absolute_path (const char *path, GFile *files)
 }
 
 static gboolean
-validate_desktop_file (GFile *desktop_file,
-                       GFile *export,
-                       GFile *files,
+validate_desktop_file (GFile      *desktop_file,
+                       GFile      *export,
+                       GFile      *files,
                        const char *app_id,
-                       char **icon,
-                       gboolean *activatable,
-                       GError **error)
+                       char      **icon,
+                       gboolean   *activatable,
+                       GError    **error)
 {
   g_autofree char *path = g_file_get_path (desktop_file);
+
   g_autoptr(GSubprocess) subprocess = NULL;
   g_autofree char *stdout_buf = NULL;
   g_autofree char *stderr_buf = NULL;
@@ -393,9 +396,9 @@ check_refs:
 
 static gboolean
 validate_icon (const char *icon,
-               GFile *export,
+               GFile      *export,
                const char *app_id,
-               GError **error)
+               GError    **error)
 {
   g_autoptr(GFile) icondir = NULL;
   g_autofree char *png = NULL;
@@ -415,13 +418,14 @@ validate_icon (const char *icon,
 }
 
 static gboolean
-validate_service_file (GFile *service_file,
-                       gboolean activatable,
-                       GFile *files,
+validate_service_file (GFile      *service_file,
+                       gboolean    activatable,
+                       GFile      *files,
                        const char *app_id,
-                       GError **error)
+                       GError    **error)
 {
   g_autofree char *path = g_file_get_path (service_file);
+
   g_autoptr(GKeyFile) key_file = NULL;
   g_autofree char *name = NULL;
   g_autofree char *command = NULL;
@@ -480,6 +484,7 @@ static gboolean
 validate_exports (GFile *export, GFile *files, const char *app_id, GError **error)
 {
   g_autofree char *desktop_path = NULL;
+
   g_autoptr(GFile) desktop_file = NULL;
   g_autofree char *service_path = NULL;
   g_autoptr(GFile) service_file = NULL;
@@ -654,7 +659,7 @@ flatpak_builtin_build_export (int argc, char **argv, GCancellable *cancellable,
   g_autoptr(GVariant) metadata_dict_v = NULL;
   gboolean is_runtime = FALSE;
   gboolean is_extension = FALSE;
-  guint64 installed_size = 0,download_size = 0;
+  guint64 installed_size = 0, download_size = 0;
   struct timespec ts;
   const char *collection_id;
 
@@ -769,7 +774,7 @@ flatpak_builtin_build_export (int argc, char **argv, GCancellable *cancellable,
     body = g_strdup_printf ("Name: %s\n"
                             "Arch: %s\n"
                             "Branch: %s\n"
-                            "Built with: "PACKAGE_STRING"\n",
+                            "Built with: "PACKAGE_STRING "\n",
                             id, arch, branch);
 
   full_branch = g_strconcat ((opt_runtime || is_runtime) ? "runtime/" : "app/", id, "/", arch, "/", branch, NULL);
diff --git a/app/flatpak-builtins-build-finish.c b/app/flatpak-builtins-build-finish.c
index 87feed13..ac3ec4e0 100644
--- a/app/flatpak-builtins-build-finish.c
+++ b/app/flatpak-builtins-build-finish.c
@@ -61,16 +61,16 @@ static GOptionEntry options[] = {
 };
 
 static gboolean
-export_dir (int                            source_parent_fd,
-            const char                    *source_name,
-            const char                    *source_relpath,
-            int                            destination_parent_fd,
-            const char                    *destination_name,
-            char                         **allowed_prefixes,
-            char                         **allowed_extensions,
-            gboolean                       require_exact_match,
-            GCancellable                  *cancellable,
-            GError                       **error)
+export_dir (int           source_parent_fd,
+            const char   *source_name,
+            const char   *source_relpath,
+            int           destination_parent_fd,
+            const char   *destination_name,
+            char        **allowed_prefixes,
+            char        **allowed_extensions,
+            gboolean      require_exact_match,
+            GCancellable *cancellable,
+            GError      **error)
 {
   int res;
 
@@ -196,14 +196,14 @@ export_dir (int                            source_parent_fd,
 }
 
 static gboolean
-copy_exports (GFile                         *source,
-              GFile                         *destination,
-              const char                    *source_prefix,
-              char                         **allowed_prefixes,
-              char                         **allowed_extensions,
-              gboolean                       require_exact_match,
-              GCancellable                  *cancellable,
-              GError                       **error)
+copy_exports (GFile        *source,
+              GFile        *destination,
+              const char   *source_prefix,
+              char        **allowed_prefixes,
+              char        **allowed_extensions,
+              gboolean      require_exact_match,
+              GCancellable *cancellable,
+              GError      **error)
 {
   if (!flatpak_mkdir_p (destination, cancellable, error))
     return FALSE;
diff --git a/app/flatpak-builtins-build-import-bundle.c b/app/flatpak-builtins-build-import-bundle.c
index 6ecdb646..68297619 100644
--- a/app/flatpak-builtins-build-import-bundle.c
+++ b/app/flatpak-builtins-build-import-bundle.c
@@ -58,6 +58,7 @@ import_oci (OstreeRepo *repo, GFile *file,
   g_autofree char *dir_uri = NULL;
   g_autofree char *target_ref = NULL;
   const char *oci_digest;
+
   g_autoptr(FlatpakOciRegistry) registry = NULL;
   g_autoptr(FlatpakOciVersioned) versioned = NULL;
   FlatpakOciManifest *manifest = NULL;
diff --git a/app/flatpak-builtins-build-init.c b/app/flatpak-builtins-build-init.c
index 420e4410..1856161d 100644
--- a/app/flatpak-builtins-build-init.c
+++ b/app/flatpak-builtins-build-init.c
@@ -67,7 +67,7 @@ static GOptionEntry options[] = {
 
 static gboolean
 ensure_extensions (FlatpakDeploy *src_deploy, const char *default_branch,
-                 char *src_extensions[], GFile *top_dir, GCancellable *cancellable, GError **error)
+                   char *src_extensions[], GFile *top_dir, GCancellable *cancellable, GError **error)
 {
   g_autoptr(GKeyFile) metakey = flatpak_deploy_get_metadata (src_deploy);
   GList *extensions = NULL, *l;
diff --git a/app/flatpak-builtins-build.c b/app/flatpak-builtins-build.c
index 044de615..83725014 100644
--- a/app/flatpak-builtins-build.c
+++ b/app/flatpak-builtins-build.c
@@ -76,11 +76,11 @@ child_setup (gpointer user_data)
 }
 
 static gboolean
-find_matching_extension_group_in_metakey (GKeyFile    *metakey,
-                                          const char  *id,
-                                          const char  *specified_tag,
-                                          char       **out_extension_group,
-                                          GError     **error)
+find_matching_extension_group_in_metakey (GKeyFile   *metakey,
+                                          const char *id,
+                                          const char *specified_tag,
+                                          char      **out_extension_group,
+                                          GError    **error)
 {
   g_auto(GStrv) groups = NULL;
   g_autofree char *extension_prefix = NULL;
@@ -98,7 +98,8 @@ find_matching_extension_group_in_metakey (GKeyFile    *metakey,
   for (iter = groups; *iter != NULL; ++iter)
     {
       const char *group_name = *iter;
-      const char *extension_name = NULL;;
+      const char *extension_name = NULL;
+      ;
       g_autofree char *extension_tag = NULL;
 
       if (!g_str_has_prefix (group_name, extension_prefix))
@@ -120,22 +121,22 @@ find_matching_extension_group_in_metakey (GKeyFile    *metakey,
         }
 
       /* Check 2: Keep track of this extension group as the last
-        * seen one. If it was the only one then we can use it. */
+       * seen one. If it was the only one then we can use it. */
       last_seen_group = group_name;
     }
 
-    if (n_extension_groups == 1 && last_seen_group != NULL)
-      {
-        *out_extension_group = g_strdup (last_seen_group);
-        return TRUE;
-      }
-    else if (n_extension_groups == 0)
-      {
-        /* Check 2: No extension groups, this is not an error case as
-         * we check the parent later. */
-        *out_extension_group = NULL;
-        return TRUE;
-      }
+  if (n_extension_groups == 1 && last_seen_group != NULL)
+    {
+      *out_extension_group = g_strdup (last_seen_group);
+      return TRUE;
+    }
+  else if (n_extension_groups == 0)
+    {
+      /* Check 2: No extension groups, this is not an error case as
+       * we check the parent later. */
+      *out_extension_group = NULL;
+      return TRUE;
+    }
 
   g_set_error (error,
                G_IO_ERROR,
@@ -485,10 +486,10 @@ flatpak_builtin_build (int argc, char **argv, GCancellable *cancellable, GError
     dest = g_strdup ("/usr");
 
   flatpak_bwrap_add_args (bwrap,
-            "--setenv", "FLATPAK_DEST", dest,
-            "--setenv", "FLATPAK_ID", id,
-            "--setenv", "FLATPAK_ARCH", runtime_ref_parts[2],
-            NULL);
+                          "--setenv", "FLATPAK_DEST", dest,
+                          "--setenv", "FLATPAK_ID", id,
+                          "--setenv", "FLATPAK_ARCH", runtime_ref_parts[2],
+                          NULL);
 
   /* Persist some stuff in /var. We can't persist everything because  that breaks /var things
    * from the host to work. For example the /home -> /var/home on atomic.
diff --git a/app/flatpak-builtins-config.c b/app/flatpak-builtins-config.c
index 007196c1..f85d6337 100644
--- a/app/flatpak-builtins-config.c
+++ b/app/flatpak-builtins-config.c
@@ -70,11 +70,12 @@ get_lang_default (FlatpakDir *dir)
   return g_strjoinv (";", langs);
 }
 
-typedef struct {
+typedef struct
+{
   const char *name;
   char *(*parse)(const char *value);
   char *(*print)(const char *value);
-  char *(*get_default)(FlatpakDir *dir);
+  char *(*get_default)(FlatpakDir * dir);
 } ConfigKey;
 
 ConfigKey keys[] = {
diff --git a/app/flatpak-builtins-create-usb.c b/app/flatpak-builtins-create-usb.c
index 03c83d0d..e2039fb9 100644
--- a/app/flatpak-builtins-create-usb.c
+++ b/app/flatpak-builtins-create-usb.c
@@ -47,25 +47,27 @@ static GOptionEntry options[] = {
   { NULL }
 };
 
-typedef struct CommitAndSubpaths {
-  gchar *commit;
+typedef struct CommitAndSubpaths
+{
+  gchar  *commit;
   gchar **subpaths;
 } CommitAndSubpaths;
 
 static void
 commit_and_subpaths_free (CommitAndSubpaths *c_s)
 {
-    g_free (c_s->commit);
-    g_strfreev (c_s->subpaths);
-    g_free (c_s);
+  g_free (c_s->commit);
+  g_strfreev (c_s->subpaths);
+  g_free (c_s);
 }
 
 static CommitAndSubpaths *
 commit_and_subpaths_new (const char *commit, const char * const *subpaths)
 {
   CommitAndSubpaths *c_s = g_new (CommitAndSubpaths, 1);
+
   c_s->commit = g_strdup (commit);
-  c_s->subpaths = g_strdupv ((char **)subpaths);
+  c_s->subpaths = g_strdupv ((char **) subpaths);
   return c_s;
 }
 
@@ -74,12 +76,12 @@ commit_and_subpaths_new (const char *commit, const char * const *subpaths)
  * printed for related refs that are not installed, and they won't be added to
  * the list. */
 static gboolean
-add_related (GHashTable    *all_refs,
-             GHashTable    *all_collection_ids,
-             const char    *ref,
-             FlatpakDir    *dir,
-             GCancellable  *cancellable,
-             GError       **error)
+add_related (GHashTable   *all_refs,
+             GHashTable   *all_collection_ids,
+             const char   *ref,
+             FlatpakDir   *dir,
+             GCancellable *cancellable,
+             GError      **error)
 {
   g_autoptr(GVariant) deploy_data = NULL;
   g_autoptr(FlatpakDeploy) deploy = NULL;
@@ -159,12 +161,12 @@ add_related (GHashTable    *all_refs,
 /* Add the runtime and its related refs to @all_refs, also updating
  * @all_collection_ids with any new collection IDs */
 static gboolean
-add_runtime (GHashTable    *all_refs,
-             GHashTable    *all_collection_ids,
-             const char    *ref,
-             FlatpakDir    *dir,
-             GCancellable  *cancellable,
-             GError       **error)
+add_runtime (GHashTable   *all_refs,
+             GHashTable   *all_collection_ids,
+             const char   *ref,
+             FlatpakDir   *dir,
+             GCancellable *cancellable,
+             GError      **error)
 {
   g_autoptr(GVariant) deploy_data = NULL;
   g_autoptr(GVariant) runtime_deploy_data = NULL;
@@ -226,14 +228,14 @@ add_runtime (GHashTable    *all_refs,
 
 /* Copied from src/ostree/ot-builtin-create-usb.c in ostree.git, with slight modifications */
 static gboolean
-ostree_create_usb (GOptionContext  *context,
-                   OstreeRepo      *src_repo,
-                   const char      *mount_root_path,
-                   struct stat      mount_root_stbuf,
-                   int              mount_root_dfd,
-                   GHashTable      *all_refs,
-                   GCancellable    *cancellable,
-                   GError         **error)
+ostree_create_usb (GOptionContext *context,
+                   OstreeRepo     *src_repo,
+                   const char     *mount_root_path,
+                   struct stat     mount_root_stbuf,
+                   int             mount_root_dfd,
+                   GHashTable     *all_refs,
+                   GCancellable   *cancellable,
+                   GError        **error)
 {
   g_autoptr(OstreeAsyncProgress) progress = NULL;
   g_auto(GLnxConsoleRef) console = { 0, };
@@ -285,6 +287,7 @@ ostree_create_usb (GOptionContext  *context,
   GLNX_HASH_TABLE_FOREACH_KV (all_refs, OstreeCollectionRef *, c_r, CommitAndSubpaths *, c_s)
   {
     GVariantBuilder builder;
+
     g_autoptr(GVariant) opts = NULL;
     OstreeRepoPullFlags flags = OSTREE_REPO_PULL_FLAGS_MIRROR;
     GVariantBuilder refs_builder;
@@ -308,7 +311,7 @@ ostree_create_usb (GOptionContext  *context,
     if (c_s->subpaths != NULL)
       {
         g_variant_builder_add (&builder, "{s@v}", "subdirs",
-                               g_variant_new_variant (g_variant_new_strv ((const char * const *)c_s->subpaths, -1)));
+                               g_variant_new_variant (g_variant_new_strv ((const char * const *) c_s->subpaths, -1)));
       }
     g_variant_builder_add (&builder, "{s@v}", "flags",
                            g_variant_new_variant (g_variant_new_int32 (flags)));
@@ -461,7 +464,7 @@ flatpak_builtin_create_usb (int argc, char **argv, GCancellable *cancellable, GE
                                     (GDestroyNotify) commit_and_subpaths_free);
 
   /* This maps from each remote name to a set of architectures */
-  remote_arch_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_strfreev);
+  remote_arch_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_strfreev);
 
   for (i = 0; i < n_prefs; i++)
     {
@@ -626,84 +629,84 @@ flatpak_builtin_create_usb (int argc, char **argv, GCancellable *cancellable, GE
 
   /* Add ostree-metadata and appstream refs for each collection ID */
   GLNX_HASH_TABLE_FOREACH_KV (all_collection_ids, const char *, collection_id, const char *, remote_name)
-    {
-      g_autoptr(OstreeCollectionRef) metadata_collection_ref = NULL;
-      g_autoptr(OstreeCollectionRef) appstream_collection_ref = NULL;
-      g_autoptr(OstreeCollectionRef) appstream2_collection_ref = NULL;
-      g_autoptr(FlatpakRemoteState) state = NULL;
-      g_autoptr(GError) local_error = NULL;
-      g_autoptr(GPtrArray) dirs = NULL;
-      g_autofree char *appstream_ref = NULL;
-      g_autofree char *appstream2_ref = NULL;
-      const char **remote_arches;
-
-      /* First try to update the repo metadata by creating a FlatpakRemoteState,
-       * but don't fail on error because we want this to work offline. */
-      state = flatpak_dir_get_remote_state_optional (dir, remote_name, cancellable, &local_error);
-      if (state == NULL)
-        {
-          g_printerr (_("Warning: Couldn't update repo metadata for remote ‘%s’: %s\n"),
-                      remote_name, local_error->message);
-          g_clear_error (&local_error);
-        }
-
-      /* Add the ostree-metadata ref to the list */
-      metadata_collection_ref = ostree_collection_ref_new (collection_id, OSTREE_REPO_METADATA_REF);
-      g_hash_table_insert (all_refs, g_steal_pointer (&metadata_collection_ref),
-                           commit_and_subpaths_new (NULL, NULL));
-
-      remote_arches = g_hash_table_lookup (remote_arch_map, remote_name);
-      for (const char **iter = remote_arches; iter != NULL && *iter != NULL; ++iter)
-        {
-          /* Try to update the appstream data */
-          const char *current_arch = *iter;
-          dirs = g_ptr_array_new ();
-          g_ptr_array_add (dirs, dir);
-          if (!update_appstream (dirs, remote_name, current_arch, 0, TRUE, cancellable, &local_error))
-            {
-              g_printerr (_("Warning: Couldn't update appstream data for remote ‘%s’ arch ‘%s’: %s\n"),
-                          remote_name, current_arch, local_error->message);
-              g_clear_error (&local_error);
-            }
+  {
+    g_autoptr(OstreeCollectionRef) metadata_collection_ref = NULL;
+    g_autoptr(OstreeCollectionRef) appstream_collection_ref = NULL;
+    g_autoptr(OstreeCollectionRef) appstream2_collection_ref = NULL;
+    g_autoptr(FlatpakRemoteState) state = NULL;
+    g_autoptr(GError) local_error = NULL;
+    g_autoptr(GPtrArray) dirs = NULL;
+    g_autofree char *appstream_ref = NULL;
+    g_autofree char *appstream2_ref = NULL;
+    const char **remote_arches;
+
+    /* First try to update the repo metadata by creating a FlatpakRemoteState,
+     * but don't fail on error because we want this to work offline. */
+    state = flatpak_dir_get_remote_state_optional (dir, remote_name, cancellable, &local_error);
+    if (state == NULL)
+      {
+        g_printerr (_("Warning: Couldn't update repo metadata for remote ‘%s’: %s\n"),
+                    remote_name, local_error->message);
+        g_clear_error (&local_error);
+      }
 
-          /* Copy the appstream data if it exists. It's optional because without it
-           * the USB will still be useful to the flatpak CLI even if GNOME Software
-           * wouldn't display the contents. */
-          appstream_ref = g_strdup_printf ("appstream/%s", current_arch);
-          appstream_collection_ref = ostree_collection_ref_new (collection_id, appstream_ref);
-          if (ostree_repo_resolve_collection_ref (src_repo, appstream_collection_ref, FALSE,
-                                                  OSTREE_REPO_RESOLVE_REV_EXT_NONE,
-                                                  NULL, cancellable, &local_error))
-            {
-              g_hash_table_insert (all_refs, g_steal_pointer (&appstream_collection_ref),
-                                   commit_and_subpaths_new (NULL, NULL));
-            }
-          else
-            {
-              g_printerr (_("Warning: Couldn't find appstream data for remote ‘%s’ arch ‘%s’: %s\n"),
-                          remote_name, current_arch, local_error->message);
-              g_clear_error (&local_error);
-            }
+    /* Add the ostree-metadata ref to the list */
+    metadata_collection_ref = ostree_collection_ref_new (collection_id, OSTREE_REPO_METADATA_REF);
+    g_hash_table_insert (all_refs, g_steal_pointer (&metadata_collection_ref),
+                         commit_and_subpaths_new (NULL, NULL));
 
-          /* Appstream2 is only for efficiency, so just print a debug message if
-           * it's missing. */
-          appstream2_ref = g_strdup_printf ("appstream2/%s", current_arch);
-          appstream2_collection_ref = ostree_collection_ref_new (collection_id, appstream2_ref);
-          if (ostree_repo_resolve_collection_ref (src_repo, appstream2_collection_ref, FALSE,
-                                                  OSTREE_REPO_RESOLVE_REV_EXT_NONE,
-                                                  NULL, cancellable, &local_error))
-            {
-              g_hash_table_insert (all_refs, g_steal_pointer (&appstream2_collection_ref),
-                                   commit_and_subpaths_new (NULL, NULL));
-            }
-          else
-            {
-              g_debug (_("Couldn't find appstream2 data for remote ‘%s’ arch ‘%s’: %s\n"),
-                          remote_name, current_arch, local_error->message);
-              g_clear_error (&local_error);
-            }
-        }
-    }
+    remote_arches = g_hash_table_lookup (remote_arch_map, remote_name);
+    for (const char **iter = remote_arches; iter != NULL && *iter != NULL; ++iter)
+      {
+        /* Try to update the appstream data */
+        const char *current_arch = *iter;
+        dirs = g_ptr_array_new ();
+        g_ptr_array_add (dirs, dir);
+        if (!update_appstream (dirs, remote_name, current_arch, 0, TRUE, cancellable, &local_error))
+          {
+            g_printerr (_("Warning: Couldn't update appstream data for remote ‘%s’ arch ‘%s’: %s\n"),
+                        remote_name, current_arch, local_error->message);
+            g_clear_error (&local_error);
+          }
+
+        /* Copy the appstream data if it exists. It's optional because without it
+         * the USB will still be useful to the flatpak CLI even if GNOME Software
+         * wouldn't display the contents. */
+        appstream_ref = g_strdup_printf ("appstream/%s", current_arch);
+        appstream_collection_ref = ostree_collection_ref_new (collection_id, appstream_ref);
+        if (ostree_repo_resolve_collection_ref (src_repo, appstream_collection_ref, FALSE,
+                                                OSTREE_REPO_RESOLVE_REV_EXT_NONE,
+                                                NULL, cancellable, &local_error))
+          {
+            g_hash_table_insert (all_refs, g_steal_pointer (&appstream_collection_ref),
+                                 commit_and_subpaths_new (NULL, NULL));
+          }
+        else
+          {
+            g_printerr (_("Warning: Couldn't find appstream data for remote ‘%s’ arch ‘%s’: %s\n"),
+                        remote_name, current_arch, local_error->message);
+            g_clear_error (&local_error);
+          }
+
+        /* Appstream2 is only for efficiency, so just print a debug message if
+         * it's missing. */
+        appstream2_ref = g_strdup_printf ("appstream2/%s", current_arch);
+        appstream2_collection_ref = ostree_collection_ref_new (collection_id, appstream2_ref);
+        if (ostree_repo_resolve_collection_ref (src_repo, appstream2_collection_ref, FALSE,
+                                                OSTREE_REPO_RESOLVE_REV_EXT_NONE,
+                                                NULL, cancellable, &local_error))
+          {
+            g_hash_table_insert (all_refs, g_steal_pointer (&appstream2_collection_ref),
+                                 commit_and_subpaths_new (NULL, NULL));
+          }
+        else
+          {
+            g_debug (_("Couldn't find appstream2 data for remote ‘%s’ arch ‘%s’: %s\n"),
+                     remote_name, current_arch, local_error->message);
+            g_clear_error (&local_error);
+          }
+      }
+  }
 
   /* Now use code copied from `ostree create-usb` to do the actual copying. We
    * can't just call out to `ostree` because (a) flatpak doesn't have a
@@ -714,14 +717,14 @@ flatpak_builtin_create_usb (int argc, char **argv, GCancellable *cancellable, GE
     g_autoptr(GString) all_refs_str = g_string_new ("");
 
     GLNX_HASH_TABLE_FOREACH (all_refs, OstreeCollectionRef *, collection_ref)
-      {
-        if (!ostree_validate_collection_id (collection_ref->collection_id, error))
-          return FALSE;
-        if (!ostree_validate_rev (collection_ref->ref_name, error))
-          return FALSE;
+    {
+      if (!ostree_validate_collection_id (collection_ref->collection_id, error))
+        return FALSE;
+      if (!ostree_validate_rev (collection_ref->ref_name, error))
+        return FALSE;
 
-        g_string_append_printf (all_refs_str, "(%s, %s) ", collection_ref->collection_id, collection_ref->ref_name);
-      }
+      g_string_append_printf (all_refs_str, "(%s, %s) ", collection_ref->collection_id, collection_ref->ref_name);
+    }
     g_debug ("Copying the following refs: %s", all_refs_str->str);
 
     if (!ostree_create_usb (context, src_repo, mount_root_path, mount_root_stbuf,
diff --git a/app/flatpak-builtins-info-remote.c b/app/flatpak-builtins-info-remote.c
index c7237ed4..64d4a148 100644
--- a/app/flatpak-builtins-info-remote.c
+++ b/app/flatpak-builtins-info-remote.c
@@ -71,7 +71,7 @@ maybe_print_space (gboolean *first)
 }
 
 static gchar *
-format_timestamp (guint64  timestamp)
+format_timestamp (guint64 timestamp)
 {
   GDateTime *dt;
   gchar *str;
diff --git a/app/flatpak-builtins-info.c b/app/flatpak-builtins-info.c
index 9a82e4dc..b59f9d91 100644
--- a/app/flatpak-builtins-info.c
+++ b/app/flatpak-builtins-info.c
@@ -80,7 +80,7 @@ maybe_print_space (gboolean *first)
 }
 
 static gchar *
-format_timestamp (guint64  timestamp)
+format_timestamp (guint64 timestamp)
 {
   GDateTime *dt;
   gchar *str;
@@ -375,51 +375,51 @@ flatpak_builtin_info (int argc, char **argv, GCancellable *cancellable, GError *
 
   if (opt_show_extensions)
     {
-       GList *extensions, *l;
-
-       extensions = flatpak_list_extensions (metakey, parts[2], parts[3]);
-       for (l = extensions; l; l = l->next)
-         {
-           FlatpakExtension *ext = l->data;
-           g_autofree const char **subpaths = NULL;
-           g_autoptr(GVariant) ext_deploy_data = NULL;
-           g_autofree char *formatted = NULL;
-
-           if (ext->is_unmaintained)
-             {
-               commit = "unmaintained";
-               origin = NULL;
-               size = 0;
-               formatted = g_strdup ("unknown");
-               subpaths = NULL;
-             }
-           else
-             {
-               ext_deploy_data = flatpak_dir_get_deploy_data (dir, ext->ref, cancellable, error);
-               if (ext_deploy_data == NULL)
-                 return FALSE;
-
-               commit = flatpak_deploy_data_get_commit (ext_deploy_data);
-               origin = flatpak_deploy_data_get_origin (ext_deploy_data);
-               size = flatpak_deploy_data_get_installed_size (ext_deploy_data);
-               formatted = g_format_size (size);
-               subpaths = flatpak_deploy_data_get_subpaths (ext_deploy_data);
-             }
-
-           g_print ("\n%s%s%s %s\n", on, _("Extension:"), off, ext->ref);
-           g_print ("%s%s%s %s\n", on, _("ID:"), off, ext->id);
-           g_print ("%s%s%s %s\n", on, _("Origin:"), off, origin ? origin : "-");
-           g_print ("%s%s%s %s\n", on, _("Commit:"), off, commit);
-           g_print ("%s%s%s %s%s\n", on, _("Installed size:"), off, subpaths && subpaths[0] ? "<" : "", formatted);
-
-           if (subpaths && subpaths[0])
-             {
-               g_autofree char *subpath_str = NULL;
-
-               subpath_str = g_strjoinv (",", (char **)subpaths);
-               g_print ("%s%s%s %s\n", on, _("Subpaths:"), off, subpath_str);
-             }
-         }
+      GList *extensions, *l;
+
+      extensions = flatpak_list_extensions (metakey, parts[2], parts[3]);
+      for (l = extensions; l; l = l->next)
+        {
+          FlatpakExtension *ext = l->data;
+          g_autofree const char **subpaths = NULL;
+          g_autoptr(GVariant) ext_deploy_data = NULL;
+          g_autofree char *formatted = NULL;
+
+          if (ext->is_unmaintained)
+            {
+              commit = "unmaintained";
+              origin = NULL;
+              size = 0;
+              formatted = g_strdup ("unknown");
+              subpaths = NULL;
+            }
+          else
+            {
+              ext_deploy_data = flatpak_dir_get_deploy_data (dir, ext->ref, cancellable, error);
+              if (ext_deploy_data == NULL)
+                return FALSE;
+
+              commit = flatpak_deploy_data_get_commit (ext_deploy_data);
+              origin = flatpak_deploy_data_get_origin (ext_deploy_data);
+              size = flatpak_deploy_data_get_installed_size (ext_deploy_data);
+              formatted = g_format_size (size);
+              subpaths = flatpak_deploy_data_get_subpaths (ext_deploy_data);
+            }
+
+          g_print ("\n%s%s%s %s\n", on, _("Extension:"), off, ext->ref);
+          g_print ("%s%s%s %s\n", on, _("ID:"), off, ext->id);
+          g_print ("%s%s%s %s\n", on, _("Origin:"), off, origin ? origin : "-");
+          g_print ("%s%s%s %s\n", on, _("Commit:"), off, commit);
+          g_print ("%s%s%s %s%s\n", on, _("Installed size:"), off, subpaths && subpaths[0] ? "<" : "", formatted);
+
+          if (subpaths && subpaths[0])
+            {
+              g_autofree char *subpath_str = NULL;
+
+              subpath_str = g_strjoinv (",", (char **) subpaths);
+              g_print ("%s%s%s %s\n", on, _("Subpaths:"), off, subpath_str);
+            }
+        }
     }
 
   return TRUE;
@@ -436,7 +436,7 @@ flatpak_complete_info (FlatpakCompletion *completion)
 
   context = g_option_context_new ("");
   if (!flatpak_option_context_parse (context, options, &completion->argc, &completion->argv,
-                                     FLATPAK_BUILTIN_FLAG_ALL_DIRS|FLATPAK_BUILTIN_FLAG_OPTIONAL_REPO, &dirs, NULL, NULL))
+                                     FLATPAK_BUILTIN_FLAG_ALL_DIRS | FLATPAK_BUILTIN_FLAG_OPTIONAL_REPO, &dirs, NULL, NULL))
     return FALSE;
 
   kinds = FLATPAK_KINDS_APP | FLATPAK_KINDS_RUNTIME;
diff --git a/app/flatpak-builtins-install.c b/app/flatpak-builtins-install.c
index 7f632c0d..7ef3a6fc 100644
--- a/app/flatpak-builtins-install.c
+++ b/app/flatpak-builtins-install.c
@@ -330,7 +330,7 @@ flatpak_builtin_install (int argc, char **argv, GCancellable *cancellable, GErro
       if (ref == NULL)
         return FALSE;
 
-      if (!flatpak_cli_transaction_add_install (transaction, remote, ref, (const char **)opt_subpaths, error))
+      if (!flatpak_cli_transaction_add_install (transaction, remote, ref, (const char **) opt_subpaths, error))
         return FALSE;
     }
 
diff --git a/app/flatpak-builtins-list-remotes.c b/app/flatpak-builtins-list-remotes.c
index 553478e9..78ddd501 100644
--- a/app/flatpak-builtins-list-remotes.c
+++ b/app/flatpak-builtins-list-remotes.c
@@ -54,7 +54,7 @@ flatpak_builtin_list_remotes (int argc, char **argv, GCancellable *cancellable,
   g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
 
   if (!flatpak_option_context_parse (context, options, &argc, &argv,
-                                     FLATPAK_BUILTIN_FLAG_STANDARD_DIRS|FLATPAK_BUILTIN_FLAG_OPTIONAL_REPO, &dirs, cancellable, error))
+                                     FLATPAK_BUILTIN_FLAG_STANDARD_DIRS | FLATPAK_BUILTIN_FLAG_OPTIONAL_REPO, &dirs, cancellable, error))
     return FALSE;
 
   if (argc > 1)
diff --git a/app/flatpak-builtins-list.c b/app/flatpak-builtins-list.c
index 5f4dce80..bfb6c6cf 100644
--- a/app/flatpak-builtins-list.c
+++ b/app/flatpak-builtins-list.c
@@ -53,14 +53,15 @@ static GOptionEntry options[] = {
 typedef struct
 {
   FlatpakDir *dir;
-  GStrv app_refs;
-  GStrv runtime_refs;
+  GStrv       app_refs;
+  GStrv       runtime_refs;
 } RefsData;
 
 static RefsData *
 refs_data_new (FlatpakDir *dir, const GStrv app_refs, const GStrv runtime_refs)
 {
   RefsData *refs_data = g_new0 (RefsData, 1);
+
   refs_data->dir = g_object_ref (dir);
   refs_data->app_refs = g_strdupv ((char **) app_refs);
   refs_data->runtime_refs = g_strdupv ((char **) runtime_refs);
@@ -116,7 +117,7 @@ find_refs_for_dir (FlatpakDir *dir, GStrv *apps, GStrv *runtimes, GCancellable *
 }
 
 static gboolean
-print_table_for_refs (gboolean print_apps, GPtrArray* refs_array, const char *arch, GCancellable *cancellable, GError **error)
+print_table_for_refs (gboolean print_apps, GPtrArray * refs_array, const char *arch, GCancellable *cancellable, GError **error)
 {
   FlatpakTablePrinter *printer = flatpak_table_printer_new ();
   int i;
@@ -313,7 +314,7 @@ flatpak_builtin_list (int argc, char **argv, GCancellable *cancellable, GError *
   g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
 
   if (!flatpak_option_context_parse (context, options, &argc, &argv,
-                                     FLATPAK_BUILTIN_FLAG_ALL_DIRS|FLATPAK_BUILTIN_FLAG_OPTIONAL_REPO,
+                                     FLATPAK_BUILTIN_FLAG_ALL_DIRS | FLATPAK_BUILTIN_FLAG_OPTIONAL_REPO,
                                      &dirs, cancellable, error))
     return FALSE;
 
diff --git a/app/flatpak-builtins-ls-remote.c b/app/flatpak-builtins-ls-remote.c
index b1158b99..48174622 100644
--- a/app/flatpak-builtins-ls-remote.c
+++ b/app/flatpak-builtins-ls-remote.c
@@ -51,10 +51,11 @@ static GOptionEntry options[] = {
   { NULL }
 };
 
-typedef struct RemoteDirPair {
-  gchar *remote_name;
+typedef struct RemoteDirPair
+{
+  gchar              *remote_name;
   FlatpakRemoteState *state;
-  FlatpakDir *dir;
+  FlatpakDir         *dir;
 } RemoteDirPair;
 
 static void
@@ -70,6 +71,7 @@ static RemoteDirPair *
 remote_dir_pair_new (const char *remote_name, FlatpakDir *dir, FlatpakRemoteState *state)
 {
   RemoteDirPair *pair = g_new (RemoteDirPair, 1);
+
   pair->remote_name = g_strdup (remote_name);
   pair->state = state;
   pair->dir = g_object_ref (dir);
@@ -94,7 +96,7 @@ flatpak_builtin_ls_remote (int argc, char **argv, GCancellable *cancellable, GEr
   const char *opt_arches[] = {NULL, NULL};
   gboolean has_remote;
   g_autoptr(GHashTable) pref_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-  g_autoptr(GHashTable) refs_hash = g_hash_table_new_full(g_direct_hash, g_direct_equal, (GDestroyNotify)g_hash_table_unref, (GDestroyNotify)remote_dir_pair_free);
+  g_autoptr(GHashTable) refs_hash = g_hash_table_new_full (g_direct_hash, g_direct_equal, (GDestroyNotify) g_hash_table_unref, (GDestroyNotify) remote_dir_pair_free);
 
   context = g_option_context_new (_(" [REMOTE or URI] - Show available runtimes and applications"));
   g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
@@ -310,7 +312,7 @@ flatpak_builtin_ls_remote (int argc, char **argv, GCancellable *cancellable, GEr
           flatpak_table_printer_add_column (printer, ref);
 
           if (!has_remote)
-              flatpak_table_printer_add_column (printer, remote);
+            flatpak_table_printer_add_column (printer, remote);
 
           if (opt_show_details)
             {
diff --git a/app/flatpak-builtins-permission-list.c b/app/flatpak-builtins-permission-list.c
index f0f89435..841a3666 100644
--- a/app/flatpak-builtins-permission-list.c
+++ b/app/flatpak-builtins-permission-list.c
@@ -64,7 +64,7 @@ get_permission_tables (XdpDbusPermissionStore *store)
 
   g_ptr_array_add (tables, NULL);
 
-  return (char **)g_ptr_array_free (tables, FALSE);
+  return (char **) g_ptr_array_free (tables, FALSE);
 }
 
 static char **
@@ -79,11 +79,11 @@ get_ids_for_table (XdpDbusPermissionStore *store,
 }
 
 static gboolean
-list_table (XdpDbusPermissionStore  *store,
-            const char              *table,
-            const char              *id,
-            FlatpakTablePrinter     *printer,
-            GError                 **error)
+list_table (XdpDbusPermissionStore *store,
+            const char             *table,
+            const char             *id,
+            FlatpakTablePrinter    *printer,
+            GError                **error)
 {
   const char *one_id[2];
   char **ids;
@@ -93,7 +93,7 @@ list_table (XdpDbusPermissionStore  *store,
     {
       one_id[0] = id;
       one_id[1] = NULL;
-      ids = (char **)one_id;
+      ids = (char **) one_id;
     }
   else
     {
diff --git a/app/flatpak-builtins-permission-remove.c b/app/flatpak-builtins-permission-remove.c
index bc0692a5..e30d4902 100644
--- a/app/flatpak-builtins-permission-remove.c
+++ b/app/flatpak-builtins-permission-remove.c
@@ -64,7 +64,7 @@ get_permission_tables (XdpDbusPermissionStore *store)
 
   g_ptr_array_add (tables, NULL);
 
-  return (char **)g_ptr_array_free (tables, FALSE);
+  return (char **) g_ptr_array_free (tables, FALSE);
 }
 
 static char **
@@ -79,10 +79,10 @@ get_ids_for_table (XdpDbusPermissionStore *store,
 }
 
 static gboolean
-remove_item (XdpDbusPermissionStore  *store,
-             const char              *table,
-             const char              *id,
-             GError                 **error)
+remove_item (XdpDbusPermissionStore *store,
+             const char             *table,
+             const char             *id,
+             GError                **error)
 {
   /* FIXME some portals cache their permission tables and assume that they're
    * the only writers, so they may miss these changes.
diff --git a/app/flatpak-builtins-permission-reset.c b/app/flatpak-builtins-permission-reset.c
index 3903529f..600de7f6 100644
--- a/app/flatpak-builtins-permission-reset.c
+++ b/app/flatpak-builtins-permission-reset.c
@@ -64,14 +64,14 @@ get_permission_tables (XdpDbusPermissionStore *store)
 
   g_ptr_array_add (tables, NULL);
 
-  return (char **)g_ptr_array_free (tables, FALSE);
+  return (char **) g_ptr_array_free (tables, FALSE);
 }
 
 static gboolean
-remove_for_app (XdpDbusPermissionStore  *store,
-                const char              *table,
-                const char              *app_id,
-                GError                 **error)
+remove_for_app (XdpDbusPermissionStore *store,
+                const char             *table,
+                const char             *app_id,
+                GError                **error)
 {
   char **ids;
   int i;
diff --git a/app/flatpak-builtins-permission-show.c b/app/flatpak-builtins-permission-show.c
index 4f7194f4..75874d67 100644
--- a/app/flatpak-builtins-permission-show.c
+++ b/app/flatpak-builtins-permission-show.c
@@ -64,15 +64,15 @@ get_permission_tables (XdpDbusPermissionStore *store)
 
   g_ptr_array_add (tables, NULL);
 
-  return (char **)g_ptr_array_free (tables, FALSE);
+  return (char **) g_ptr_array_free (tables, FALSE);
 }
 
 static gboolean
-list_for_app (XdpDbusPermissionStore  *store,
-              const char              *table,
-              const char              *app_id,
-              FlatpakTablePrinter     *printer,
-              GError                 **error)
+list_for_app (XdpDbusPermissionStore *store,
+              const char             *table,
+              const char             *app_id,
+              FlatpakTablePrinter    *printer,
+              GError                **error)
 {
   char **ids;
   int i;
diff --git a/app/flatpak-builtins-repair.c b/app/flatpak-builtins-repair.c
index ee56d9a0..f917058f 100644
--- a/app/flatpak-builtins-repair.c
+++ b/app/flatpak-builtins-repair.c
@@ -47,10 +47,10 @@ typedef enum {
 } FsckStatus;
 
 static FsckStatus
-fsck_one_object (OstreeRepo            *repo,
-                 const char            *checksum,
-                 OstreeObjectType       objtype,
-                 gboolean               allow_missing)
+fsck_one_object (OstreeRepo      *repo,
+                 const char      *checksum,
+                 OstreeObjectType objtype,
+                 gboolean         allow_missing)
 {
   g_autoptr(GError) local_error = NULL;
 
@@ -77,10 +77,10 @@ fsck_one_object (OstreeRepo            *repo,
 
 /* This is used for leaf object types */
 static FsckStatus
-fsck_leaf_object (OstreeRepo            *repo,
-                  const char            *checksum,
-                  OstreeObjectType       objtype,
-                  GHashTable            *object_status_cache)
+fsck_leaf_object (OstreeRepo      *repo,
+                  const char      *checksum,
+                  OstreeObjectType objtype,
+                  GHashTable      *object_status_cache)
 {
   g_autoptr(GVariant) key = NULL;
   gpointer cached_status;
@@ -103,19 +103,20 @@ fsck_leaf_object (OstreeRepo            *repo,
 
 
 static FsckStatus
-fsck_dirtree (OstreeRepo            *repo,
-              gboolean               partial,
-              const char            *checksum,
-              GHashTable            *object_status_cache)
+fsck_dirtree (OstreeRepo *repo,
+              gboolean    partial,
+              const char *checksum,
+              GHashTable *object_status_cache)
 {
   OstreeRepoCommitIterResult iterres;
+
   g_autoptr(GError) local_error = NULL;
   FsckStatus status = 0;
   g_autoptr(GVariant) key = NULL;
   g_autoptr(GVariant) dirtree = NULL;
   gpointer cached_status;
   ostree_cleanup_repo_commit_traverse_iter
-    OstreeRepoCommitTraverseIter iter = { 0, };
+  OstreeRepoCommitTraverseIter iter = { 0, };
 
   key = g_variant_ref_sink (ostree_object_name_serialize (checksum, OSTREE_OBJECT_TYPE_DIR_TREE));
   if (g_hash_table_lookup_extended (object_status_cache, key, NULL, &cached_status))
@@ -188,9 +189,9 @@ fsck_dirtree (OstreeRepo            *repo,
 }
 
 static FsckStatus
-fsck_commit (OstreeRepo            *repo,
-             const char            *checksum,
-             GHashTable            *object_status_cache)
+fsck_commit (OstreeRepo *repo,
+             const char *checksum,
+             GHashTable *object_status_cache)
 {
   g_autoptr(GError) local_error = NULL;
   g_autoptr(GVariant) commit = NULL;
@@ -235,9 +236,9 @@ fsck_commit (OstreeRepo            *repo,
 }
 
 static void
-transaction_add_local_ref (FlatpakDir *dir,
+transaction_add_local_ref (FlatpakDir         *dir,
                            FlatpakTransaction *transaction,
-                           const char *ref)
+                           const char         *ref)
 {
   g_autoptr(GVariant) deploy_data = NULL;
   g_autoptr(GError) local_error = NULL;
@@ -313,7 +314,7 @@ flatpak_builtin_repair (int argc, char **argv, GCancellable *cancellable, GError
    */
 
   object_status_cache = g_hash_table_new_full (ostree_hash_object_name, g_variant_equal,
-                                               (GDestroyNotify)g_variant_unref, NULL);
+                                               (GDestroyNotify) g_variant_unref, NULL);
 
   invalid_refs = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 
@@ -322,38 +323,38 @@ flatpak_builtin_repair (int argc, char **argv, GCancellable *cancellable, GError
                               cancellable, error))
     return FALSE;
 
-  GLNX_HASH_TABLE_FOREACH_KV(all_refs, const char *, refspec, const char *, checksum)
-    {
-      g_autofree char *remote = NULL;
-      g_autofree char *ref_name = NULL;
-      FsckStatus status;
-
-      if (!ostree_parse_refspec (refspec, &remote, &ref_name, error))
-        return FALSE;
-
-      /* Does this look like a regular ref? */
-      if (g_str_has_prefix (ref_name, "app/") || g_str_has_prefix (ref_name, "runtime/"))
-        {
-          g_autofree char *origin = flatpak_dir_get_origin (dir, ref_name, cancellable, NULL);
-
-          /* If so, is it deployed, and from this remote? */
-          if (remote == NULL || g_strcmp0 (origin, remote) != 0)
-            {
-              g_print (_("Removing non-deployed ref %s...\n"), refspec);
-              (void)ostree_repo_set_ref_immediate (repo, remote, ref_name, NULL, cancellable, NULL);
-              continue;
-            }
-        }
-
-      g_print (_("Verifying %s...\n"), refspec);
-
-      status = fsck_commit (repo, checksum, object_status_cache);
-      if (status != FSCK_STATUS_OK)
-        {
-          g_printerr (_("Deleting ref %s due to missing objects\n"), refspec);
-          (void)ostree_repo_set_ref_immediate (repo, remote, ref_name, NULL, cancellable, NULL);
-        }
-    }
+  GLNX_HASH_TABLE_FOREACH_KV (all_refs, const char *, refspec, const char *, checksum)
+  {
+    g_autofree char *remote = NULL;
+    g_autofree char *ref_name = NULL;
+    FsckStatus status;
+
+    if (!ostree_parse_refspec (refspec, &remote, &ref_name, error))
+      return FALSE;
+
+    /* Does this look like a regular ref? */
+    if (g_str_has_prefix (ref_name, "app/") || g_str_has_prefix (ref_name, "runtime/"))
+      {
+        g_autofree char *origin = flatpak_dir_get_origin (dir, ref_name, cancellable, NULL);
+
+        /* If so, is it deployed, and from this remote? */
+        if (remote == NULL || g_strcmp0 (origin, remote) != 0)
+          {
+            g_print (_("Removing non-deployed ref %s...\n"), refspec);
+            (void) ostree_repo_set_ref_immediate (repo, remote, ref_name, NULL, cancellable, NULL);
+            continue;
+          }
+      }
+
+    g_print (_("Verifying %s...\n"), refspec);
+
+    status = fsck_commit (repo, checksum, object_status_cache);
+    if (status != FSCK_STATUS_OK)
+      {
+        g_printerr (_("Deleting ref %s due to missing objects\n"), refspec);
+        (void) ostree_repo_set_ref_immediate (repo, remote, ref_name, NULL, cancellable, NULL);
+      }
+  }
 
   g_print (_("Pruning objects\n"));
 
diff --git a/app/flatpak-builtins-repo-update.c b/app/flatpak-builtins-repo-update.c
index 123efd19..e53c4df1 100644
--- a/app/flatpak-builtins-repo-update.c
+++ b/app/flatpak-builtins-repo-update.c
@@ -67,9 +67,9 @@ static GOptionEntry options[] = {
 };
 
 static void
-_ostree_parse_delta_name (const char  *delta_name,
-                          char        **out_from,
-                          char        **out_to)
+_ostree_parse_delta_name (const char *delta_name,
+                          char      **out_from,
+                          char      **out_to)
 {
   g_auto(GStrv) parts = g_strsplit (delta_name, "-", 2);
 
@@ -132,10 +132,10 @@ _ostree_get_relative_static_delta_path (const char *from,
 }
 
 static gboolean
-_ostree_repo_static_delta_delete (OstreeRepo                    *self,
-                                  const char                    *delta_id,
-                                  GCancellable                  *cancellable,
-                                  GError                      **error)
+_ostree_repo_static_delta_delete (OstreeRepo   *self,
+                                  const char   *delta_id,
+                                  GCancellable *cancellable,
+                                  GError      **error)
 {
   gboolean ret = FALSE;
   g_autofree char *from = NULL;
@@ -163,17 +163,17 @@ _ostree_repo_static_delta_delete (OstreeRepo                    *self,
     goto out;
 
   ret = TRUE;
- out:
+out:
   return ret;
 }
 
 static gboolean
-generate_one_delta (OstreeRepo *repo,
-                    const char *from,
-                    const char *to,
-                    const char *ref,
+generate_one_delta (OstreeRepo   *repo,
+                    const char   *from,
+                    const char   *to,
+                    const char   *ref,
                     GCancellable *cancellable,
-                    GError **error)
+                    GError      **error)
 {
   g_autoptr(GVariantBuilder) parambuilder = NULL;
   g_autoptr(GVariant) params = NULL;
@@ -217,18 +217,19 @@ delta_generation_done (GObject      *source_object,
                        gpointer      user_data)
 {
   int *n_spawned_delta_generate = user_data;
+
   (*n_spawned_delta_generate)--;
 }
 
 static gboolean
 spawn_delete_generation (GMainContext *context,
-                         int *n_spawned_delta_generate,
-                         OstreeRepo *repo,
-                         GVariant *params,
-                         const char *ref,
-                         const char *from,
-                         const char *to,
-                         GError **error)
+                         int          *n_spawned_delta_generate,
+                         OstreeRepo   *repo,
+                         GVariant     *params,
+                         const char   *ref,
+                         const char   *from,
+                         const char   *to,
+                         GError      **error)
 {
   g_autoptr(GSubprocessLauncher) launcher = g_subprocess_launcher_new (0);
   g_autoptr(GSubprocess) subprocess = NULL;
@@ -274,10 +275,10 @@ spawn_delete_generation (GMainContext *context,
 }
 
 static gboolean
-generate_all_deltas (OstreeRepo *repo,
-                     GPtrArray **unwanted_deltas,
+generate_all_deltas (OstreeRepo   *repo,
+                     GPtrArray   **unwanted_deltas,
                      GCancellable *cancellable,
-                     GError **error)
+                     GError      **error)
 {
   g_autoptr(GHashTable) all_refs = NULL;
   g_autoptr(GHashTable) all_deltas_hash = NULL;
diff --git a/app/flatpak-builtins-run.c b/app/flatpak-builtins-run.c
index 2bb07128..2df44798 100644
--- a/app/flatpak-builtins-run.c
+++ b/app/flatpak-builtins-run.c
@@ -247,10 +247,11 @@ flatpak_complete_run (FlatpakCompletion *completion)
       }
 
       system_dirs = flatpak_dir_get_system_list (NULL, &error);
-      if (system_dirs == NULL) {
-        flatpak_completion_debug ("find system installations error: %s", error->message);
-        break;
-      }
+      if (system_dirs == NULL)
+        {
+          flatpak_completion_debug ("find system installations error: %s", error->message);
+          break;
+        }
 
       for (i = 0; i < system_dirs->len; i++)
         {
diff --git a/app/flatpak-builtins-search.c b/app/flatpak-builtins-search.c
index 94044d3e..0e3b6fc0 100644
--- a/app/flatpak-builtins-search.c
+++ b/app/flatpak-builtins-search.c
@@ -41,7 +41,7 @@ get_remote_stores (GPtrArray *dirs, const char *arch, GCancellable *cancellable)
 {
   GError *error = NULL;
   GPtrArray *ret = g_ptr_array_new_with_free_func (g_object_unref);
-  guint i,j;
+  guint i, j;
 
   if (arch == NULL)
     arch = flatpak_get_arch ();
@@ -69,7 +69,7 @@ get_remote_stores (GPtrArray *dirs, const char *arch, GCancellable *cancellable)
         {
           g_autoptr(AsStore) store = as_store_new ();
 
-#if AS_CHECK_VERSION(0, 6, 1)
+#if AS_CHECK_VERSION (0, 6, 1)
           // We want to see multiple versions/branches of same app-id's, e.g. org.gnome.Platform
           as_store_set_add_flags (store, as_store_get_add_flags (store) | AS_STORE_ADD_FLAG_USE_UNIQUE_ID);
 #endif
@@ -89,7 +89,7 @@ get_remote_stores (GPtrArray *dirs, const char *arch, GCancellable *cancellable)
               g_clear_error (&error);
             }
 
-          g_object_set_data_full (G_OBJECT(store), "remote-name", g_strdup (remotes[j]), g_free);
+          g_object_set_data_full (G_OBJECT (store), "remote-name", g_strdup (remotes[j]), g_free);
           g_ptr_array_add (ret, g_steal_pointer (&store));
         }
     }
@@ -100,13 +100,15 @@ static void
 clear_app_arches (AsApp *app)
 {
   GPtrArray *arches = as_app_get_architectures (app);
+
   g_ptr_array_set_size (arches, 0);
 }
 
-typedef struct MatchResult {
-  AsApp *app;
+typedef struct MatchResult
+{
+  AsApp     *app;
   GPtrArray *remotes;
-  guint score;
+  guint      score;
 } MatchResult;
 
 static void
@@ -121,6 +123,7 @@ static MatchResult *
 match_result_new (AsApp *app, guint score)
 {
   MatchResult *result = g_new (MatchResult, 1);
+
   result->app = g_object_ref (app);
   result->remotes = g_ptr_array_new_with_free_func (g_free);
   result->score = score;
@@ -134,23 +137,24 @@ static void
 match_result_add_remote (MatchResult *self, const char *remote)
 {
   guint i;
+
   for (i = 0; i < self->remotes->len; ++i)
-   {
-     const char *remote_entry = g_ptr_array_index (self->remotes, i);
-     if (!strcmp (remote, remote_entry))
+    {
+      const char *remote_entry = g_ptr_array_index (self->remotes, i);
+      if (!strcmp (remote, remote_entry))
         return;
-   }
-   g_ptr_array_add (self->remotes, g_strdup(remote));
+    }
+  g_ptr_array_add (self->remotes, g_strdup (remote));
 }
 
 static int
 compare_by_score (MatchResult *a, MatchResult *b, gpointer user_data)
 {
   // Reverse order, higher score comes first
-  return (int)b->score - (int)a->score;
+  return (int) b->score - (int) a->score;
 }
 
-#if !AS_CHECK_VERSION(0, 6, 1)
+#if !AS_CHECK_VERSION (0, 6, 1)
 /* Roughly copied directly from appstream-glib */
 
 static const gchar *
@@ -172,8 +176,8 @@ as_app_get_unique_id (AsApp *app)
     kind_str = as_app_kind_to_string (kind);
   id_str = as_app_get_id_no_prefix (app);
   return g_strdup_printf ("%s/%s",
-           as_app_fix_unique_nullable (kind_str),
-           as_app_fix_unique_nullable (id_str));
+                          as_app_fix_unique_nullable (kind_str),
+                          as_app_fix_unique_nullable (id_str));
 }
 
 static gboolean
@@ -225,7 +229,7 @@ print_app (MatchResult *res, FlatpakTablePrinter *printer)
 
   flatpak_table_printer_add_column (printer, id);
   flatpak_table_printer_add_column (printer, version);
-#if AS_CHECK_VERSION(0, 6, 1)
+#if AS_CHECK_VERSION (0, 6, 1)
   flatpak_table_printer_add_column (printer, as_app_get_branch (res->app));
 #endif
   flatpak_table_printer_add_column (printer, g_ptr_array_index (res->remotes, 0));
@@ -281,7 +285,7 @@ flatpak_builtin_search (int argc, char **argv, GCancellable *cancellable, GError
 
           // Avoid duplicate entries, but show multiple remotes
           GSList *list_entry = g_slist_find_custom (matches, app,
-                                 (GCompareFunc)compare_apps);
+                                                    (GCompareFunc) compare_apps);
           MatchResult *result = NULL;
           if (list_entry != NULL)
             result = list_entry->data;
@@ -289,10 +293,10 @@ flatpak_builtin_search (int argc, char **argv, GCancellable *cancellable, GError
             {
               result = match_result_new (app, score);
               matches = g_slist_insert_sorted_with_data (matches, result,
-                          (GCompareDataFunc)compare_by_score, NULL);
+                                                         (GCompareDataFunc) compare_by_score, NULL);
             }
           match_result_add_remote (result,
-                                   g_object_get_data (G_OBJECT(store), "remote-name"));
+                                   g_object_get_data (G_OBJECT (store), "remote-name"));
         }
     }
 
@@ -303,16 +307,16 @@ flatpak_builtin_search (int argc, char **argv, GCancellable *cancellable, GError
 
       flatpak_table_printer_set_column_title (printer, col++, _("Application ID"));
       flatpak_table_printer_set_column_title (printer, col++, _("Version"));
-#if AS_CHECK_VERSION(0, 6, 1)
+#if AS_CHECK_VERSION (0, 6, 1)
       flatpak_table_printer_set_column_title (printer, col++, _("Branch"));
 #endif
       flatpak_table_printer_set_column_title (printer, col++, _("Remotes"));
       flatpak_table_printer_set_column_title (printer, col++, _("Description"));
-      g_slist_foreach (matches, (GFunc)print_app, printer);
+      g_slist_foreach (matches, (GFunc) print_app, printer);
       flatpak_table_printer_print (printer);
       flatpak_table_printer_free (printer);
 
-      g_slist_free_full (matches, (GDestroyNotify)match_result_free);
+      g_slist_free_full (matches, (GDestroyNotify) match_result_free);
     }
   else
     {
diff --git a/app/flatpak-builtins-uninstall.c b/app/flatpak-builtins-uninstall.c
index 07b05c3a..31ba4c4a 100644
--- a/app/flatpak-builtins-uninstall.c
+++ b/app/flatpak-builtins-uninstall.c
@@ -59,10 +59,11 @@ static GOptionEntry options[] = {
   { NULL }
 };
 
-typedef struct {
+typedef struct
+{
   FlatpakDir *dir;
   GHashTable *refs_hash;
-  GPtrArray *refs;
+  GPtrArray  *refs;
 } UninstallDir;
 
 static UninstallDir *
@@ -88,7 +89,7 @@ uninstall_dir_free (UninstallDir *udir)
 
 static void
 uninstall_dir_add_ref (UninstallDir *udir,
-                       const char *ref)
+                       const char   *ref)
 {
   if (g_hash_table_insert (udir->refs_hash, g_strdup (ref), NULL))
     g_ptr_array_add (udir->refs, g_strdup (ref));
@@ -171,7 +172,7 @@ flatpak_builtin_uninstall (int argc, char **argv, GCancellable *cancellable, GEr
     }
 
   kinds = flatpak_kinds_from_bools (opt_app, opt_runtime);
-  uninstall_dirs = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify)uninstall_dir_free);
+  uninstall_dirs = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) uninstall_dir_free);
 
   if (opt_all)
     {
@@ -242,34 +243,35 @@ flatpak_builtin_uninstall (int argc, char **argv, GCancellable *cancellable, GEr
                 g_hash_table_add (used_runtimes, g_steal_pointer (&runtime));
             }
 
-          GLNX_HASH_TABLE_FOREACH(used_runtimes, const char *, runtime)
-            {
-              g_autofree char *runtime_ref = g_strconcat ("runtime/", runtime, NULL);
-              g_autoptr(FlatpakDeploy) deploy = NULL;
-              g_autofree char *origin = NULL;
-              g_autofree char *sdk = NULL;
-              g_autoptr(GKeyFile) metakey = NULL;
+          GLNX_HASH_TABLE_FOREACH (used_runtimes, const char *, runtime)
+          {
+            g_autofree char *runtime_ref = g_strconcat ("runtime/", runtime, NULL);
 
-              deploy = flatpak_dir_load_deployed (dir, runtime_ref, NULL, NULL, NULL);
-              if (deploy == NULL)
-                continue;
+            g_autoptr(FlatpakDeploy) deploy = NULL;
+            g_autofree char *origin = NULL;
+            g_autofree char *sdk = NULL;
+            g_autoptr(GKeyFile) metakey = NULL;
 
-              origin = flatpak_dir_get_origin (dir, runtime_ref, NULL, NULL);
-              if (origin == NULL)
-                continue;
+            deploy = flatpak_dir_load_deployed (dir, runtime_ref, NULL, NULL, NULL);
+            if (deploy == NULL)
+              continue;
 
-              find_used_refs (dir, used_refs, runtime_ref, origin);
+            origin = flatpak_dir_get_origin (dir, runtime_ref, NULL, NULL);
+            if (origin == NULL)
+              continue;
 
-              metakey = flatpak_deploy_get_metadata (deploy);
-              sdk = g_key_file_get_string (metakey, "Runtime", "sdk", NULL);
-              if (sdk)
-                {
-                  g_autofree char *sdk_ref = g_strconcat ("runtime/", sdk, NULL);
-                  g_autofree char *sdk_origin = flatpak_dir_get_origin (dir, sdk_ref, NULL, NULL);
-                  if (sdk_origin)
-                    find_used_refs (dir, used_refs, sdk_ref, sdk_origin);
-                }
-            }
+            find_used_refs (dir, used_refs, runtime_ref, origin);
+
+            metakey = flatpak_deploy_get_metadata (deploy);
+            sdk = g_key_file_get_string (metakey, "Runtime", "sdk", NULL);
+            if (sdk)
+              {
+                g_autofree char *sdk_ref = g_strconcat ("runtime/", sdk, NULL);
+                g_autofree char *sdk_origin = flatpak_dir_get_origin (dir, sdk_ref, NULL, NULL);
+                if (sdk_origin)
+                  find_used_refs (dir, used_refs, sdk_ref, sdk_origin);
+              }
+          }
 
           for (i = 0; runtime_refs[i] != NULL; i++)
             {
@@ -288,7 +290,7 @@ flatpak_builtin_uninstall (int argc, char **argv, GCancellable *cancellable, GEr
               g_print (_("Uninstalling from %s:\n"), flatpak_dir_get_name (dir));
               g_ptr_array_sort (udir->refs, flatpak_strcmp0_ptr);
               for (i = 0; i < udir->refs->len; i++)
-                g_print (" %s\n", (char *)udir->refs->pdata[i]);
+                g_print (" %s\n", (char *) udir->refs->pdata[i]);
               found_something_to_uninstall = TRUE;
             }
         }
@@ -388,30 +390,30 @@ flatpak_builtin_uninstall (int argc, char **argv, GCancellable *cancellable, GEr
     }
 
   GLNX_HASH_TABLE_FOREACH_V (uninstall_dirs, UninstallDir *, udir)
-    {
-      g_autoptr(FlatpakTransaction) transaction = NULL;
+  {
+    g_autoptr(FlatpakTransaction) transaction = NULL;
 
-      transaction = flatpak_cli_transaction_new (udir->dir, opt_yes, TRUE, error);
-      if (transaction == NULL)
-        return FALSE;
+    transaction = flatpak_cli_transaction_new (udir->dir, opt_yes, TRUE, error);
+    if (transaction == NULL)
+      return FALSE;
 
-      flatpak_transaction_set_disable_prune (transaction, opt_keep_ref);
-      flatpak_transaction_set_force_uninstall (transaction, opt_force_remove);
+    flatpak_transaction_set_disable_prune (transaction, opt_keep_ref);
+    flatpak_transaction_set_force_uninstall (transaction, opt_force_remove);
 
-      /* This disables the remote metadata update, since uninstall is a local-only op */
-      flatpak_transaction_set_no_pull (transaction, TRUE);
+    /* This disables the remote metadata update, since uninstall is a local-only op */
+    flatpak_transaction_set_no_pull (transaction, TRUE);
 
-      for (i = 0; i < udir->refs->len; i++)
-        {
-          const char *ref = (char *)g_ptr_array_index (udir->refs, i);
+    for (i = 0; i < udir->refs->len; i++)
+      {
+        const char *ref = (char *) g_ptr_array_index (udir->refs, i);
 
-          if (!flatpak_transaction_add_uninstall (transaction, ref, error))
-            return FALSE;
-        }
+        if (!flatpak_transaction_add_uninstall (transaction, ref, error))
+          return FALSE;
+      }
 
-      if (!flatpak_cli_transaction_run (transaction, cancellable, error))
-        return FALSE;
-    }
+    if (!flatpak_cli_transaction_run (transaction, cancellable, error))
+      return FALSE;
+  }
 
 
   return TRUE;
diff --git a/app/flatpak-builtins-update.c b/app/flatpak-builtins-update.c
index 5d13c2e1..064e5bf7 100644
--- a/app/flatpak-builtins-update.c
+++ b/app/flatpak-builtins-update.c
@@ -106,7 +106,7 @@ flatpak_builtin_update (int           argc,
       n_prefs = 1;
     }
 
-  transactions = g_ptr_array_new_with_free_func ((GDestroyNotify)g_object_unref);
+  transactions = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
 
   for (k = 0; k < dirs->len; k++)
     {
@@ -178,7 +178,7 @@ flatpak_builtin_update (int           argc,
                     continue;
 
                   found = TRUE;
-                  if (!flatpak_transaction_add_update (transaction, refs[i], (const char **)opt_subpaths, opt_commit, error))
+                  if (!flatpak_transaction_add_update (transaction, refs[i], (const char **) opt_subpaths, opt_commit, error))
                     return FALSE;
                 }
             }
@@ -209,7 +209,7 @@ flatpak_builtin_update (int           argc,
                     continue;
 
                   found = TRUE;
-                  if (!flatpak_transaction_add_update (transaction, refs[i], (const char **)opt_subpaths, opt_commit, error))
+                  if (!flatpak_transaction_add_update (transaction, refs[i], (const char **) opt_subpaths, opt_commit, error))
                     return FALSE;
                 }
             }
diff --git a/app/flatpak-builtins-utils.c b/app/flatpak-builtins-utils.c
index 0868664a..2657035d 100644
--- a/app/flatpak-builtins-utils.c
+++ b/app/flatpak-builtins-utils.c
@@ -84,10 +84,11 @@ get_soup_session (void)
 }
 
 GBytes *
-download_uri (const char     *url,
-              GError        **error)
+download_uri (const char *url,
+              GError    **error)
 {
   SoupSession *session;
+
   g_autoptr(SoupRequest) req = NULL;
   g_autoptr(GInputStream) input = NULL;
   g_autoptr(GOutputStream) out = NULL;
@@ -121,6 +122,7 @@ flatpak_find_installed_pref (const char *pref, FlatpakKinds kinds, const char *d
   g_autofree char *id = NULL;
   g_autofree char *arch = NULL;
   g_autofree char *branch = NULL;
+
   g_autoptr(GError) lookup_error = NULL;
   FlatpakDir *dir = NULL;
   g_autofree char *ref = NULL;
@@ -255,7 +257,7 @@ flatpak_find_installed_pref (const char *pref, FlatpakKinds kinds, const char *d
 
 
 static gboolean
-open_source_stream (char **gpg_import,
+open_source_stream (char         **gpg_import,
                     GInputStream **out_source_stream,
                     GCancellable  *cancellable,
                     GError       **error)
@@ -304,7 +306,7 @@ open_source_stream (char **gpg_import,
 }
 
 GBytes *
-flatpak_load_gpg_keys (char **gpg_import,
+flatpak_load_gpg_keys (char        **gpg_import,
                        GCancellable *cancellable,
                        GError      **error)
 {
@@ -367,7 +369,7 @@ flatpak_resolve_duplicate_remotes (GPtrArray    *dirs,
         {
           FlatpakDir *dir = g_ptr_array_index (dirs_with_remote, i);
           g_autofree char *dir_name = flatpak_dir_get_name (dir);
-          g_print("%d) %s\n", i + 1, dir_name);
+          g_print ("%d) %s\n", i + 1, dir_name);
         }
       chosen = flatpak_number_prompt (0, dirs_with_remote->len, _("Which do you want to use (0 to abort)?"));
       if (chosen == 0)
@@ -393,24 +395,25 @@ flatpak_resolve_duplicate_remotes (GPtrArray    *dirs,
 static guint64
 get_file_age (GFile *file)
 {
-    guint64 now;
-    guint64 mtime;
-    g_autoptr(GFileInfo) info = NULL;
-
-    info = g_file_query_info (file,
-                              G_FILE_ATTRIBUTE_TIME_MODIFIED,
-                              G_FILE_QUERY_INFO_NONE,
-                              NULL,
-                              NULL);
-    if (info == NULL)
-      return G_MAXUINT64;
-
-    mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
-    now = (guint64) g_get_real_time () / G_USEC_PER_SEC;
-    if (mtime > now)
-      return G_MAXUINT64;
-
-    return (guint64) (now - mtime);
+  guint64 now;
+  guint64 mtime;
+
+  g_autoptr(GFileInfo) info = NULL;
+
+  info = g_file_query_info (file,
+                            G_FILE_ATTRIBUTE_TIME_MODIFIED,
+                            G_FILE_QUERY_INFO_NONE,
+                            NULL,
+                            NULL);
+  if (info == NULL)
+    return G_MAXUINT64;
+
+  mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
+  now = (guint64) g_get_real_time () / G_USEC_PER_SEC;
+  if (mtime > now)
+    return G_MAXUINT64;
+
+  return (guint64) (now - mtime);
 }
 
 static void
diff --git a/app/flatpak-builtins-utils.h b/app/flatpak-builtins-utils.h
index 9f527670..f66b21e8 100644
--- a/app/flatpak-builtins-utils.h
+++ b/app/flatpak-builtins-utils.h
@@ -29,25 +29,25 @@
 /* Appstream data expires after a day */
 #define FLATPAK_APPSTREAM_TTL 86400
 
-gboolean    looks_like_branch (const char  *branch);
-GBytes *    download_uri      (const char  *url,
-                               GError     **error);
+gboolean    looks_like_branch (const char *branch);
+GBytes *    download_uri (const char *url,
+                          GError    **error);
 
-GBytes * flatpak_load_gpg_keys (char **gpg_import,
+GBytes * flatpak_load_gpg_keys (char        **gpg_import,
                                 GCancellable *cancellable,
                                 GError      **error);
 
-FlatpakDir * flatpak_find_installed_pref (const char *pref,
-                                          FlatpakKinds kinds,
-                                          const char *default_arch,
-                                          const char *default_branch,
-                                          gboolean search_all,
-                                          gboolean search_user,
-                                          gboolean search_system,
-                                          char **search_installations,
-                                          char **out_ref,
+FlatpakDir * flatpak_find_installed_pref (const char   *pref,
+                                          FlatpakKinds  kinds,
+                                          const char   *default_arch,
+                                          const char   *default_branch,
+                                          gboolean      search_all,
+                                          gboolean      search_user,
+                                          gboolean      search_system,
+                                          char        **search_installations,
+                                          char        **out_ref,
                                           GCancellable *cancellable,
-                                          GError **error);
+                                          GError      **error);
 
 gboolean flatpak_resolve_duplicate_remotes (GPtrArray    *dirs,
                                             const char   *remote_name,
diff --git a/app/flatpak-builtins.h b/app/flatpak-builtins.h
index 8ff0f2ec..31855932 100644
--- a/app/flatpak-builtins.h
+++ b/app/flatpak-builtins.h
@@ -56,7 +56,7 @@ gboolean usage_error (GOptionContext *context,
 
 #define BUILTINPROTO(name) \
   gboolean flatpak_builtin_ ## name (int argc, char **argv, GCancellable * cancellable, GError * *error); \
-  gboolean flatpak_complete_ ## name (FlatpakCompletion *completion);
+  gboolean flatpak_complete_ ## name (FlatpakCompletion * completion);
 
 
 BUILTINPROTO (add_remote)
diff --git a/app/flatpak-cli-transaction.c b/app/flatpak-cli-transaction.c
index 811665bb..77395fe2 100644
--- a/app/flatpak-cli-transaction.c
+++ b/app/flatpak-cli-transaction.c
@@ -31,22 +31,24 @@
 #include <sys/ioctl.h>
 
 
-struct _FlatpakCliTransaction {
+struct _FlatpakCliTransaction
+{
   FlatpakTransaction parent;
 
-  char *name;
-  gboolean disable_interaction;
-  gboolean stop_on_first_error;
-  gboolean is_user;
-  gboolean aborted;
-  GError *first_operation_error;
+  char              *name;
+  gboolean           disable_interaction;
+  gboolean           stop_on_first_error;
+  gboolean           is_user;
+  gboolean           aborted;
+  GError            *first_operation_error;
 
-  gboolean progress_initialized;
-  int progress_n_columns;
-  int progress_last_width;
+  gboolean           progress_initialized;
+  int                progress_n_columns;
+  int                progress_last_width;
 };
 
-struct _FlatpakCliTransactionClass {
+struct _FlatpakCliTransactionClass
+{
   FlatpakCliTransactionClass parent_class;
 };
 
@@ -54,12 +56,12 @@ G_DEFINE_TYPE (FlatpakCliTransaction, flatpak_cli_transaction, FLATPAK_TYPE_TRAN
 
 static int
 choose_remote_for_ref (FlatpakTransaction *transaction,
-                       const char *for_ref,
-                       const char *runtime_ref,
+                       const char         *for_ref,
+                       const char         *runtime_ref,
                        const char * const *remotes)
 {
   FlatpakCliTransaction *self = FLATPAK_CLI_TRANSACTION (transaction);
-  int n_remotes = g_strv_length ((char **)remotes);
+  int n_remotes = g_strv_length ((char **) remotes);
   int chosen = -1;
   const char *pref;
   int i;
@@ -95,11 +97,11 @@ choose_remote_for_ref (FlatpakTransaction *transaction,
 }
 
 static gboolean
-add_new_remote (FlatpakTransaction *transaction,
+add_new_remote (FlatpakTransaction            *transaction,
                 FlatpakTransactionRemoteReason reason,
-                const char *from_id,
-                const char *remote_name,
-                const char *url)
+                const char                    *from_id,
+                const char                    *remote_name,
+                const char                    *url)
 {
   FlatpakCliTransaction *self = FLATPAK_CLI_TRANSACTION (transaction);
 
@@ -134,12 +136,16 @@ op_type_to_string (FlatpakTransactionOperationType operation_type)
     {
     case FLATPAK_TRANSACTION_OPERATION_INSTALL:
       return _("install");
+
     case FLATPAK_TRANSACTION_OPERATION_UPDATE:
       return _("update");
+
     case FLATPAK_TRANSACTION_OPERATION_INSTALL_BUNDLE:
       return _("install bundle");
+
     case FLATPAK_TRANSACTION_OPERATION_UNINSTALL:
       return _("uninstall");
+
     default:
       return "Unknown type"; /* Should not happen */
     }
@@ -151,9 +157,10 @@ op_type_to_string (FlatpakTransactionOperationType operation_type)
 
 static void
 progress_changed_cb (FlatpakTransactionProgress *progress,
-                     gpointer data)
+                     gpointer                    data)
 {
   FlatpakCliTransaction *cli = data;
+
   g_autoptr(GString) str = g_string_new ("");
   int i;
   int n_full, remainder, partial;
@@ -176,10 +183,10 @@ progress_changed_cb (FlatpakTransactionProgress *progress,
 
   n_full = (BAR_LENGTH * percent) / 100;
   remainder = percent - (n_full * 100 / BAR_LENGTH);
-  partial = (remainder * strlen(BAR_CHARS) * BAR_LENGTH) / 100;
+  partial = (remainder * strlen (BAR_CHARS) * BAR_LENGTH) / 100;
 
   for (i = 0; i < n_full; i++)
-    g_string_append_c (str, BAR_CHARS[strlen(BAR_CHARS)-1]);
+    g_string_append_c (str, BAR_CHARS[strlen (BAR_CHARS) - 1]);
 
   if (i < BAR_LENGTH)
     {
@@ -206,13 +213,13 @@ progress_done (FlatpakTransaction *transaction)
   FlatpakCliTransaction *self = FLATPAK_CLI_TRANSACTION (transaction);
 
   if (self->progress_initialized)
-    g_print("\n");
+    g_print ("\n");
 }
 
 static void
-new_operation (FlatpakTransaction *transaction,
+new_operation (FlatpakTransaction          *transaction,
                FlatpakTransactionOperation *operation,
-               FlatpakTransactionProgress *progress)
+               FlatpakTransactionProgress  *progress)
 {
   FlatpakCliTransaction *self = FLATPAK_CLI_TRANSACTION (transaction);
   const char *pref;
@@ -232,12 +239,14 @@ new_operation (FlatpakTransaction *transaction,
       else
         g_print (_("Installing: %s from %s\n"), pref, remote);
       break;
+
     case FLATPAK_TRANSACTION_OPERATION_UPDATE:
       if (self->is_user)
         g_print (_("Updating for user: %s from %s\n"), pref, remote);
       else
         g_print (_("Updating: %s from %s\n"), pref, remote);
       break;
+
     case FLATPAK_TRANSACTION_OPERATION_INSTALL_BUNDLE:
       {
         bundle_basename = g_file_get_basename (bundle);
@@ -247,12 +256,14 @@ new_operation (FlatpakTransaction *transaction,
           g_print (_("Installing: %s from bundle %s\n"), pref, bundle_basename);
       }
       break;
+
     case FLATPAK_TRANSACTION_OPERATION_UNINSTALL:
       if (self->is_user)
         g_print (_("Uninstalling for user: %s\n"), pref);
       else
         g_print (_("Uninstalling: %s\n"), pref);
       break;
+
     default:
       g_assert_not_reached ();
       break;
@@ -265,9 +276,9 @@ new_operation (FlatpakTransaction *transaction,
 }
 
 static void
-operation_done (FlatpakTransaction *transaction,
+operation_done (FlatpakTransaction          *transaction,
                 FlatpakTransactionOperation *operation,
-                FlatpakTransactionResult details)
+                FlatpakTransactionResult     details)
 {
   FlatpakTransactionOperationType operation_type = flatpak_transaction_operation_get_operation_type (operation);
   const char *commit = flatpak_transaction_operation_get_commit (operation);
@@ -285,9 +296,9 @@ operation_done (FlatpakTransaction *transaction,
 }
 
 static gboolean
-operation_error (FlatpakTransaction *transaction,
-                FlatpakTransactionOperation *operation,
-                 const GError *error,
+operation_error (FlatpakTransaction            *transaction,
+                 FlatpakTransactionOperation   *operation,
+                 const GError                  *error,
                  FlatpakTransactionErrorDetails detail)
 {
   FlatpakCliTransaction *self = FLATPAK_CLI_TRANSACTION (transaction);
@@ -330,9 +341,9 @@ operation_error (FlatpakTransaction *transaction,
 
 static void
 end_of_lifed (FlatpakTransaction *transaction,
-                 const char *ref,
-                 const char *reason,
-                 const char *rebase)
+              const char         *ref,
+              const char         *reason,
+              const char         *rebase)
 {
   if (rebase)
     {
@@ -352,9 +363,9 @@ cmpstringp (const void *p1, const void *p2)
 }
 
 static void
-append_permissions (GPtrArray *permissions,
-                    GKeyFile *metadata,
-                    GKeyFile *old_metadata,
+append_permissions (GPtrArray  *permissions,
+                    GKeyFile   *metadata,
+                    GKeyFile   *old_metadata,
                     const char *group)
 {
   g_auto(GStrv) options = g_key_file_get_string_list (metadata, FLATPAK_METADATA_GROUP_CONTEXT, group, NULL, NULL);
@@ -375,7 +386,7 @@ append_permissions (GPtrArray *permissions,
       if (option[0] == '!')
         continue;
 
-      if (old_options && g_strv_contains ((const char * const*)old_options, option))
+      if (old_options && g_strv_contains ((const char * const *) old_options, option))
         continue;
 
       if (strcmp (group, FLATPAK_METADATA_KEY_DEVICES) == 0 && strcmp (option, "all") == 0)
@@ -386,10 +397,10 @@ append_permissions (GPtrArray *permissions,
 }
 
 static void
-append_bus (GPtrArray *talk,
-            GPtrArray *own,
-            GKeyFile *metadata,
-            GKeyFile *old_metadata,
+append_bus (GPtrArray  *talk,
+            GPtrArray  *own,
+            GKeyFile   *metadata,
+            GKeyFile   *old_metadata,
             const char *group)
 {
   g_auto(GStrv) keys = NULL;
@@ -425,8 +436,8 @@ append_bus (GPtrArray *talk,
 
 static void
 print_perm_line (FlatpakTablePrinter *printer,
-                 const char *title,
-                 GPtrArray *items)
+                 const char          *title,
+                 GPtrArray           *items)
 {
   g_autoptr(GString) res = g_string_new (NULL);
   int i;
@@ -439,7 +450,7 @@ print_perm_line (FlatpakTablePrinter *printer,
     {
       if (i != 0)
         g_string_append (res, ", ");
-      g_string_append (res, (char *)items->pdata[i]);
+      g_string_append (res, (char *) items->pdata[i]);
     }
 
   flatpak_table_printer_add_span (printer, res->str);
@@ -448,9 +459,9 @@ print_perm_line (FlatpakTablePrinter *printer,
 
 static void
 print_permissions (FlatpakTablePrinter *printer,
-                   GKeyFile *metadata,
-                   GKeyFile *old_metadata,
-                   const char *ref)
+                   GKeyFile            *metadata,
+                   GKeyFile            *old_metadata,
+                   const char          *ref)
 {
   g_autoptr(GPtrArray) permissions = g_ptr_array_new_with_free_func (g_free);
   g_autoptr(GPtrArray) files = g_ptr_array_new_with_free_func (g_free);
@@ -483,19 +494,19 @@ print_permissions (FlatpakTablePrinter *printer,
   append_bus (session_bus_talk, session_bus_own,
               metadata, old_metadata, FLATPAK_METADATA_GROUP_SESSION_BUS_POLICY);
   print_perm_line (printer,
-                   old_metadata ? _("new dbus access") :_("dbus access") ,
+                   old_metadata ? _("new dbus access") : _("dbus access"),
                    session_bus_talk);
   print_perm_line (printer,
-                   old_metadata ? _("new dbus ownership") :_("dbus ownership") ,
+                   old_metadata ? _("new dbus ownership") : _("dbus ownership"),
                    session_bus_own);
 
   append_bus (system_bus_talk, system_bus_own,
               metadata, old_metadata, FLATPAK_METADATA_GROUP_SYSTEM_BUS_POLICY);
   print_perm_line (printer,
-                   old_metadata ? _("new system dbus access") :_("system dbus access") ,
+                   old_metadata ? _("new system dbus access") : _("system dbus access"),
                    system_bus_talk);
   print_perm_line (printer,
-                   old_metadata ? _("new system dbus ownership") :_("system dbus ownership") ,
+                   old_metadata ? _("new system dbus ownership") : _("system dbus ownership"),
                    system_bus_own);
 }
 
@@ -646,9 +657,9 @@ flatpak_cli_transaction_class_init (FlatpakCliTransactionClass *klass)
 
 FlatpakTransaction *
 flatpak_cli_transaction_new (FlatpakDir *dir,
-                             gboolean disable_interaction,
-                             gboolean stop_on_first_error,
-                             GError **error)
+                             gboolean    disable_interaction,
+                             gboolean    stop_on_first_error,
+                             GError    **error)
 {
   g_autoptr(FlatpakInstallation) installation = NULL;
   g_autoptr(FlatpakCliTransaction) self = NULL;
@@ -671,40 +682,41 @@ flatpak_cli_transaction_new (FlatpakDir *dir,
 
   flatpak_transaction_add_default_dependency_sources (FLATPAK_TRANSACTION (self));
 
-  return (FlatpakTransaction *)g_steal_pointer (&self);
+  return (FlatpakTransaction *) g_steal_pointer (&self);
 }
 
 gboolean
 flatpak_cli_transaction_add_install (FlatpakTransaction *transaction,
-                                     const char *remote,
-                                     const char *ref,
-                                     const char **subpaths,
-                                     GError **error)
+                                     const char         *remote,
+                                     const char         *ref,
+                                     const char        **subpaths,
+                                     GError            **error)
 {
   g_autoptr(GError) local_error = NULL;
 
-    if (!flatpak_transaction_add_install (transaction, remote, ref, subpaths, &local_error))
-      {
-        if (g_error_matches (local_error, FLATPAK_ERROR, FLATPAK_ERROR_ALREADY_INSTALLED))
-          {
-            g_printerr (_("Skipping: %s\n"), local_error->message);
-            return TRUE;
-          }
+  if (!flatpak_transaction_add_install (transaction, remote, ref, subpaths, &local_error))
+    {
+      if (g_error_matches (local_error, FLATPAK_ERROR, FLATPAK_ERROR_ALREADY_INSTALLED))
+        {
+          g_printerr (_("Skipping: %s\n"), local_error->message);
+          return TRUE;
+        }
 
-        g_propagate_error (error, g_steal_pointer (&local_error));
-        return FALSE;
-      }
+      g_propagate_error (error, g_steal_pointer (&local_error));
+      return FALSE;
+    }
 
-    return TRUE;
+  return TRUE;
 }
 
 
 gboolean
 flatpak_cli_transaction_run (FlatpakTransaction *transaction,
-                             GCancellable *cancellable,
-                             GError **error)
+                             GCancellable       *cancellable,
+                             GError            **error)
 {
   FlatpakCliTransaction *self = FLATPAK_CLI_TRANSACTION (transaction);
+
   g_autoptr(GError) local_error = NULL;
   gboolean res;
 
diff --git a/app/flatpak-cli-transaction.h b/app/flatpak-cli-transaction.h
index 07a7dbb4..4c79bee3 100644
--- a/app/flatpak-cli-transaction.h
+++ b/app/flatpak-cli-transaction.h
@@ -27,20 +27,20 @@
 #define FLATPAK_TYPE_CLI_TRANSACTION flatpak_cli_transaction_get_type ()
 G_DECLARE_FINAL_TYPE (FlatpakCliTransaction, flatpak_cli_transaction, FLATPAK, CLI_TRANSACTION, FlatpakTransaction)
 
-FlatpakTransaction *flatpak_cli_transaction_new (FlatpakDir *dir,
-                                                 gboolean disable_interaction,
-                                                 gboolean stop_on_first_error,
-                                                 GError **error);
+FlatpakTransaction * flatpak_cli_transaction_new (FlatpakDir * dir,
+                                                  gboolean disable_interaction,
+                                                  gboolean stop_on_first_error,
+                                                  GError * *error);
 
 gboolean flatpak_cli_transaction_add_install (FlatpakTransaction *self,
-                                              const char *remote,
-                                              const char *ref,
-                                              const char **subpaths,
-                                              GError **error);
+                                              const char         *remote,
+                                              const char         *ref,
+                                              const char        **subpaths,
+                                              GError            **error);
 gboolean flatpak_cli_transaction_was_aborted (FlatpakTransaction *transaction);
 
 gboolean flatpak_cli_transaction_run (FlatpakTransaction *transaction,
-                                      GCancellable *cancellable,
-                                      GError **error);
+                                      GCancellable       *cancellable,
+                                      GError            **error);
 
 #endif /* __FLATPAK_CLI_TRANSACTION_H__ */
diff --git a/app/flatpak-complete.c b/app/flatpak-complete.c
index 978bd99e..826be39b 100644
--- a/app/flatpak-complete.c
+++ b/app/flatpak-complete.c
@@ -96,7 +96,7 @@ flatpak_complete_word (FlatpakCompletion *completion,
 
   rest = string + strlen (completion->cur);
 
-  shell_cur_end = shell_cur + strlen(shell_cur);
+  shell_cur_end = shell_cur + strlen (shell_cur);
   while (shell_cur_end > shell_cur &&
          rest > string &&
          shell_cur_end[-1] == rest[-1] &&
@@ -114,7 +114,7 @@ flatpak_complete_word (FlatpakCompletion *completion,
 
 void
 flatpak_complete_ref (FlatpakCompletion *completion,
-                      OstreeRepo *repo)
+                      OstreeRepo        *repo)
 {
   g_autoptr(GHashTable) refs = NULL;
   flatpak_completion_debug ("completing REF");
@@ -129,7 +129,7 @@ flatpak_complete_ref (FlatpakCompletion *completion,
       g_hash_table_iter_init (&hashiter, refs);
       while ((g_hash_table_iter_next (&hashiter, &hashkey, &hashvalue)))
         {
-          const char *ref = (const char *)hashkey;
+          const char *ref = (const char *) hashkey;
           if (!(g_str_has_prefix (ref, "runtime/") ||
                 g_str_has_prefix (ref, "app/")))
             continue;
@@ -161,16 +161,17 @@ find_current_element (const char *str)
 
 void
 flatpak_complete_partial_ref (FlatpakCompletion *completion,
-                              FlatpakKinds kinds,
-                              const char *only_arch,
-                              FlatpakDir *dir,
-                              const char *remote)
+                              FlatpakKinds       kinds,
+                              const char        *only_arch,
+                              FlatpakDir        *dir,
+                              const char        *remote)
 {
   FlatpakKinds matched_kinds;
   const char *pref;
   g_autofree char *id = NULL;
   g_autofree char *arch = NULL;
   g_autofree char *branch = NULL;
+
   g_auto(GStrv) refs = NULL;
   int element;
   const char *cur_parts[4] = { NULL };
@@ -193,7 +194,7 @@ flatpak_complete_partial_ref (FlatpakCompletion *completion,
       refs = flatpak_dir_find_remote_refs (dir, completion->argv[1],
                                            (element > 1) ? id : NULL,
                                            (element > 3) ? branch : NULL,
-                                           (element > 2 )? arch : only_arch,
+                                           (element > 2) ? arch : only_arch,
                                            matched_kinds, NULL, &error);
     }
   else
@@ -201,7 +202,7 @@ flatpak_complete_partial_ref (FlatpakCompletion *completion,
       refs = flatpak_dir_find_installed_refs (dir,
                                               (element > 1) ? id : NULL,
                                               (element > 3) ? branch : NULL,
-                                              (element > 2 )? arch : only_arch,
+                                              (element > 2) ? arch : only_arch,
                                               matched_kinds, &error);
     }
   if (refs == NULL)
@@ -278,21 +279,22 @@ should_filter_out_option_from_completion (FlatpakCompletion *completion,
 {
   switch (entry->arg)
     {
-      case G_OPTION_ARG_NONE:
-      case G_OPTION_ARG_STRING:
-      case G_OPTION_ARG_INT:
-      case G_OPTION_ARG_FILENAME:
-      case G_OPTION_ARG_DOUBLE:
-      case G_OPTION_ARG_INT64:
-        return switch_already_in_line (completion, entry);
-      default:
-        return FALSE;
+    case G_OPTION_ARG_NONE:
+    case G_OPTION_ARG_STRING:
+    case G_OPTION_ARG_INT:
+    case G_OPTION_ARG_FILENAME:
+    case G_OPTION_ARG_DOUBLE:
+    case G_OPTION_ARG_INT64:
+      return switch_already_in_line (completion, entry);
+
+    default:
+      return FALSE;
     }
 }
 
 void
 flatpak_complete_options (FlatpakCompletion *completion,
-                          GOptionEntry *entries)
+                          GOptionEntry      *entries)
 {
   GOptionEntry *e = entries;
   int i;
@@ -345,11 +347,14 @@ flatpak_complete_options (FlatpakCompletion *completion,
         {
           /* If this is just a switch, then don't add it multiple
            * times */
-          if (!should_filter_out_option_from_completion (completion, e)) {
-            flatpak_complete_word (completion, "--%s ", e->long_name);
-          }  else {
-            flatpak_completion_debug ("switch --%s is already in line %s", e->long_name, completion->line);
-          }
+          if (!should_filter_out_option_from_completion (completion, e))
+            {
+              flatpak_complete_word (completion, "--%s ", e->long_name);
+            }
+          else
+            {
+              flatpak_completion_debug ("switch --%s is already in line %s", e->long_name, completion->line);
+            }
         }
 
       /* We may end up checking switch_already_in_line twice, but this is
@@ -360,11 +365,14 @@ flatpak_complete_options (FlatpakCompletion *completion,
           /* This is a switch, we may not want to add it */
           if (!e->arg_description)
             {
-              if (!should_filter_out_option_from_completion (completion, e)) {
-                flatpak_complete_word (completion, "-%c ", e->short_name);
-              } else {
-                flatpak_completion_debug ("switch -%c is already in line %s", e->short_name, completion->line);
-              }
+              if (!should_filter_out_option_from_completion (completion, e))
+                {
+                  flatpak_complete_word (completion, "-%c ", e->short_name);
+                }
+              else
+                {
+                  flatpak_completion_debug ("switch -%c is already in line %s", e->short_name, completion->line);
+                }
             }
           else
             {
@@ -382,9 +390,9 @@ flatpak_complete_context (FlatpakCompletion *completion)
 }
 
 static gchar *
-pick_word_at (const char  *s,
-              int          cursor,
-              int         *out_word_begins_at)
+pick_word_at (const char *s,
+              int         cursor,
+              int        *out_word_begins_at)
 {
   int begin, end;
 
@@ -395,7 +403,7 @@ pick_word_at (const char  *s,
       return NULL;
     }
 
-  if (is_word_separator (s[cursor]) && ((cursor > 0 && is_word_separator(s[cursor-1])) || cursor == 0))
+  if (is_word_separator (s[cursor]) && ((cursor > 0 && is_word_separator (s[cursor - 1])) || cursor == 0))
     {
       if (out_word_begins_at != NULL)
         *out_word_begins_at = cursor;
diff --git a/app/flatpak-complete.h b/app/flatpak-complete.h
index f093ac98..68740796 100644
--- a/app/flatpak-complete.h
+++ b/app/flatpak-complete.h
@@ -24,39 +24,41 @@
 #include <ostree.h>
 #include "flatpak-dir-private.h"
 
-struct FlatpakCompletion {
-  char *shell_cur;
-  char *cur;
-  char *prev;
-  char *line;
-  int point;
+struct FlatpakCompletion
+{
+  char  *shell_cur;
+  char  *cur;
+  char  *prev;
+  char  *line;
+  int    point;
   char **argv;
   char **original_argv;
-  int argc;
-  int original_argc;
+  int    argc;
+  int    original_argc;
 };
 
-void flatpak_completion_debug (const gchar *format, ...);
+void flatpak_completion_debug (const gchar *format,
+                               ...);
 
-FlatpakCompletion *flatpak_completion_new   (const char        *arg_line,
-                                             const char        *arg_point,
-                                             const char        *arg_cur);
-void               flatpak_complete_word    (FlatpakCompletion *completion,
-                                             char              *format,
-                                             ...) G_GNUC_PRINTF(2,3);
-void               flatpak_complete_ref     (FlatpakCompletion *completion,
-                                             OstreeRepo        *repo);
+FlatpakCompletion *flatpak_completion_new (const char *arg_line,
+                                           const char *arg_point,
+                                           const char *arg_cur);
+void               flatpak_complete_word (FlatpakCompletion *completion,
+                                          char              *format,
+                                          ...) G_GNUC_PRINTF (2, 3);
+void               flatpak_complete_ref (FlatpakCompletion *completion,
+                                         OstreeRepo        *repo);
 void               flatpak_complete_partial_ref (FlatpakCompletion *completion,
-                                                 FlatpakKinds kinds,
-                                                 const char *only_arch,
-                                                 FlatpakDir *dir,
-                                                 const char *remote);
-void               flatpak_complete_file    (FlatpakCompletion *completion,
-                                             const char        *file_type);
-void               flatpak_complete_dir     (FlatpakCompletion *completion);
+                                                 FlatpakKinds       kinds,
+                                                 const char        *only_arch,
+                                                 FlatpakDir        *dir,
+                                                 const char        *remote);
+void               flatpak_complete_file (FlatpakCompletion *completion,
+                                          const char        *file_type);
+void               flatpak_complete_dir (FlatpakCompletion *completion);
 void               flatpak_complete_options (FlatpakCompletion *completion,
                                              GOptionEntry      *entries);
-void               flatpak_completion_free  (FlatpakCompletion *completion);
+void               flatpak_completion_free (FlatpakCompletion *completion);
 void               flatpak_complete_context (FlatpakCompletion *completion);
 
 #endif /* __FLATPAK_COMPLETE_H__ */
diff --git a/app/flatpak-main.c b/app/flatpak-main.c
index 2b77eb6d..98334564 100644
--- a/app/flatpak-main.c
+++ b/app/flatpak-main.c
@@ -54,11 +54,11 @@ typedef struct
                  GCancellable *cancellable,
                  GError      **error);
   gboolean (*complete)(FlatpakCompletion *completion);
-  gboolean    deprecated;
+  gboolean deprecated;
 } FlatpakCommand;
 
 static FlatpakCommand commands[] = {
-   /* translators: please keep the leading space */
+  /* translators: please keep the leading space */
   { N_(" Manage installed apps and runtimes") },
   { "install", N_("Install an application or runtime"), flatpak_builtin_install, flatpak_complete_install },
   { "update", N_("Update an installed application or runtime"), flatpak_builtin_update, flatpak_complete_update },
@@ -71,32 +71,32 @@ static FlatpakCommand commands[] = {
   { "repair", N_("Repair flatpak installation"), flatpak_builtin_repair, flatpak_complete_repair },
   { "create-usb", N_("Put apps and/or runtimes onto removable media"), flatpak_builtin_create_usb, flatpak_complete_create_usb },
 
-   /* translators: please keep the leading newline and space */
+  /* translators: please keep the leading newline and space */
   { N_("\n Finding applications and runtimes") },
   { "search", N_("Search for remote apps/runtimes"), flatpak_builtin_search, flatpak_complete_search },
 
-   /* translators: please keep the leading newline and space */
+  /* translators: please keep the leading newline and space */
   { N_("\n Running applications") },
   { "run", N_("Run an application"), flatpak_builtin_run, flatpak_complete_run },
   { "override", N_("Override permissions for an application"), flatpak_builtin_override, flatpak_complete_override },
   { "make-current", N_("Specify default version to run"), flatpak_builtin_make_current_app, flatpak_complete_make_current_app },
   { "enter", N_("Enter the namespace of a running application"), flatpak_builtin_enter, flatpak_complete_enter },
 
-   /* translators: please keep the leading newline and space */
+  /* translators: please keep the leading newline and space */
   { N_("\n Manage file access") },
   { "document-export", N_("Grant an application access to a specific file"), flatpak_builtin_document_export, flatpak_complete_document_export },
   { "document-unexport", N_("Revoke access to a specific file"), flatpak_builtin_document_unexport, flatpak_complete_document_unexport },
   { "document-info", N_("Show information about a specific file"), flatpak_builtin_document_info, flatpak_complete_document_info },
   { "document-list", N_("List exported files"), flatpak_builtin_document_list, flatpak_complete_document_list },
 
-   /* translators: please keep the leading newline and space */
+  /* translators: please keep the leading newline and space */
   { N_("\n Manage dynamic permissions") },
   { "permission-remove", N_("Remove item from permission store"), flatpak_builtin_permission_remove, flatpak_complete_permission_remove },
   { "permission-list", N_("List permissions"), flatpak_builtin_permission_list, flatpak_complete_permission_list },
   { "permission-show", N_("Show app permissions"), flatpak_builtin_permission_show, flatpak_complete_permission_show },
   { "permission-reset", N_("Reset app permissions"), flatpak_builtin_permission_reset, flatpak_complete_permission_reset },
 
-   /* translators: please keep the leading newline and space */
+  /* translators: please keep the leading newline and space */
   { N_("\n Manage remote repositories") },
   { "remotes", N_("List all configured remotes"), flatpak_builtin_list_remotes, flatpak_complete_list_remotes },
   { "remote-add", N_("Add a new remote repository (by URL)"), flatpak_builtin_add_remote, flatpak_complete_add_remote },
@@ -106,7 +106,7 @@ static FlatpakCommand commands[] = {
   { "remote-ls", N_("List contents of a configured remote"), flatpak_builtin_ls_remote, flatpak_complete_ls_remote },
   { "remote-info", N_("Show information about a remote app or runtime"), flatpak_builtin_info_remote, flatpak_complete_info_remote },
 
-   /* translators: please keep the leading newline and space */
+  /* translators: please keep the leading newline and space */
   { N_("\n Build applications") },
   { "build-init", N_("Initialize a directory for building"), flatpak_builtin_build_init, flatpak_complete_build_init },
   { "build", N_("Run a build command inside the build dir"), flatpak_builtin_build, flatpak_complete_build  },
@@ -426,8 +426,8 @@ usage_error (GOptionContext *context, const char *message, GError **error)
 }
 
 static FlatpakCommand *
-extract_command (int     *argc,
-                 char   **argv,
+extract_command (int         *argc,
+                 char       **argv,
                  const char **command_name_out)
 {
   FlatpakCommand *command;
@@ -592,7 +592,7 @@ main (int    argc,
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
-  g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE|G_LOG_LEVEL_WARNING, message_handler, NULL);
+  g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_WARNING, message_handler, NULL);
 
   g_set_prgname (argv[0]);
 
diff --git a/app/flatpak-table-printer.c b/app/flatpak-table-printer.c
index c8997b21..6270b742 100644
--- a/app/flatpak-table-printer.c
+++ b/app/flatpak-table-printer.c
@@ -29,9 +29,10 @@
 #include <locale.h>
 
 
-typedef struct {
-  char *text;
-  int align;
+typedef struct
+{
+  char    *text;
+  int      align;
   gboolean span;
 } Cell;
 
@@ -87,6 +88,7 @@ flatpak_table_printer_add_aligned_column (FlatpakTablePrinter *printer,
                                           int                  align)
 {
   Cell *cell = g_new0 (Cell, 1);
+
   cell->text = text ? g_strdup (text) : g_strdup ("");
   cell->align = align;
   g_ptr_array_add (printer->current, cell);
@@ -97,6 +99,7 @@ flatpak_table_printer_add_span (FlatpakTablePrinter *printer,
                                 const char          *text)
 {
   Cell *cell = g_new0 (Cell, 1);
+
   cell->text = text ? g_strdup (text) : g_strdup ("");
   cell->align = -1;
   cell->span = TRUE;
@@ -139,6 +142,7 @@ flatpak_table_printer_add_column_len (FlatpakTablePrinter *printer,
                                       gsize                len)
 {
   Cell *cell = g_new0 (Cell, 1);
+
   cell->text = text ? g_strndup (text, len) : g_strdup ("");
   cell->align = -1;
   g_ptr_array_add (printer->current, cell);
@@ -165,9 +169,9 @@ flatpak_table_printer_append_with_comma (FlatpakTablePrinter *printer,
 }
 
 void
-flatpak_table_printer_append_with_comma_printf  (FlatpakTablePrinter *printer,
-                                                 const char          *format,
-                                                 ...)
+flatpak_table_printer_append_with_comma_printf (FlatpakTablePrinter *printer,
+                                                const char          *format,
+                                                ...)
 {
   va_list var_args;
   g_autofree char *s = NULL;
diff --git a/app/flatpak-table-printer.h b/app/flatpak-table-printer.h
index 42066b3a..69ab2265 100644
--- a/app/flatpak-table-printer.h
+++ b/app/flatpak-table-printer.h
@@ -25,29 +25,29 @@
 
 typedef struct FlatpakTablePrinter FlatpakTablePrinter;
 
-FlatpakTablePrinter *flatpak_table_printer_new               (void);
-void                flatpak_table_printer_free               (FlatpakTablePrinter *printer);
-void                flatpak_table_printer_set_column_title   (FlatpakTablePrinter *printer,
-                                                              int                  column,
-                                                              const char          *title);
-void                flatpak_table_printer_add_column         (FlatpakTablePrinter *printer,
-                                                              const char          *text);
+FlatpakTablePrinter *flatpak_table_printer_new (void);
+void                flatpak_table_printer_free (FlatpakTablePrinter *printer);
+void                flatpak_table_printer_set_column_title (FlatpakTablePrinter *printer,
+                                                            int                  column,
+                                                            const char          *title);
+void                flatpak_table_printer_add_column (FlatpakTablePrinter *printer,
+                                                      const char          *text);
 void                flatpak_table_printer_add_aligned_column (FlatpakTablePrinter *printer,
                                                               const char          *text,
                                                               int                  align);
 void                flatpak_table_printer_add_decimal_column (FlatpakTablePrinter *printer,
                                                               const char          *text);
-void                flatpak_table_printer_add_column_len     (FlatpakTablePrinter *printer,
-                                                              const char          *text,
-                                                              gsize                len);
-void                flatpak_table_printer_add_span           (FlatpakTablePrinter *printer,
-                                                              const char          *text);
-void                flatpak_table_printer_append_with_comma  (FlatpakTablePrinter *printer,
-                                                              const char          *text);
-void                flatpak_table_printer_append_with_comma_printf  (FlatpakTablePrinter *printer,
-                                                                     const char          *format,
-                                                                     ...);
-void                flatpak_table_printer_finish_row         (FlatpakTablePrinter *printer);
-void                flatpak_table_printer_print              (FlatpakTablePrinter *printer);
+void                flatpak_table_printer_add_column_len (FlatpakTablePrinter *printer,
+                                                          const char          *text,
+                                                          gsize                len);
+void                flatpak_table_printer_add_span (FlatpakTablePrinter *printer,
+                                                    const char          *text);
+void                flatpak_table_printer_append_with_comma (FlatpakTablePrinter *printer,
+                                                             const char          *text);
+void                flatpak_table_printer_append_with_comma_printf (FlatpakTablePrinter *printer,
+                                                                    const char          *format,
+                                                                    ...);
+void                flatpak_table_printer_finish_row (FlatpakTablePrinter *printer);
+void                flatpak_table_printer_print (FlatpakTablePrinter *printer);
 
 #endif /* __FLATPAK_TABLE_PRINTER_H__ */
diff --git a/app/parse-datetime.h b/app/parse-datetime.h
index 6973758b..1c6900cc 100644
--- a/app/parse-datetime.h
+++ b/app/parse-datetime.h
@@ -19,4 +19,6 @@
 #include <stdbool.h>
 #include <time.h>
 
-bool parse_datetime (struct timespec *, char const *, struct timespec const *);
+bool parse_datetime (struct timespec *,
+                     char const *,
+                     struct timespec const *);
diff --git a/common/flatpak-bundle-ref.c b/common/flatpak-bundle-ref.c
index 34c37fdd..1400186e 100644
--- a/common/flatpak-bundle-ref.c
+++ b/common/flatpak-bundle-ref.c
@@ -123,7 +123,7 @@ flatpak_bundle_ref_class_init (FlatpakBundleRefClass *klass)
                                                         "",
                                                         "",
                                                         G_TYPE_FILE,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/common/flatpak-bwrap-private.h b/common/flatpak-bwrap-private.h
index b09b12b1..2a633d30 100644
--- a/common/flatpak-bwrap-private.h
+++ b/common/flatpak-bwrap-private.h
@@ -21,64 +21,65 @@
 #ifndef __FLATPAK_BWRAP_H__
 #define __FLATPAK_BWRAP_H__
 
-typedef struct {
+typedef struct
+{
   GPtrArray *argv;
-  GArray *noinherit_fds; /* Just keep these open while the bwrap lives */
-  GArray *fds;
-  GStrv envp;
+  GArray    *noinherit_fds; /* Just keep these open while the bwrap lives */
+  GArray    *fds;
+  GStrv      envp;
 } FlatpakBwrap;
 
 extern char *flatpak_bwrap_empty_env[1];
 
-FlatpakBwrap *flatpak_bwrap_new              (char         **env);
-void          flatpak_bwrap_free             (FlatpakBwrap  *bwrap);
-void          flatpak_bwrap_set_env          (FlatpakBwrap  *bwrap,
-                                              const char    *variable,
-                                              const char    *value,
-                                              gboolean       overwrite);
-gboolean      flatpak_bwrap_is_empty         (FlatpakBwrap  *bwrap);
-void          flatpak_bwrap_finish           (FlatpakBwrap  *bwrap);
-void          flatpak_bwrap_unset_env        (FlatpakBwrap  *bwrap,
-                                              const char    *variable);
-void          flatpak_bwrap_add_arg          (FlatpakBwrap  *bwrap,
-                                              const char    *arg);
-void          flatpak_bwrap_add_noinherit_fd (FlatpakBwrap  *bwrap,
-                                              int            fd);
-void          flatpak_bwrap_add_fd           (FlatpakBwrap  *bwrap,
-                                              int            fd);
-void          flatpak_bwrap_add_args         (FlatpakBwrap  *bwrap,
-                                              ...);
-void          flatpak_bwrap_add_arg_printf   (FlatpakBwrap *bwrap,
-                                              const char *format,
-                                              ...) G_GNUC_PRINTF (2, 3);
-void          flatpak_bwrap_append_argsv     (FlatpakBwrap *bwrap,
-                                              char        **args,
-                                              int           len);
-void          flatpak_bwrap_append_bwrap      (FlatpakBwrap  *bwrap,
-                                               FlatpakBwrap  *other); /* Steals the fds */
-void          flatpak_bwrap_append_args      (FlatpakBwrap  *bwrap,
-                                              GPtrArray     *other_array);
-void          flatpak_bwrap_add_args_data_fd (FlatpakBwrap  *bwrap,
-                                              const char    *op,
-                                              int            fd,
-                                              const char    *path_optional);
-gboolean      flatpak_bwrap_add_args_data    (FlatpakBwrap  *bwrap,
-                                              const char    *name,
-                                              const char    *content,
-                                              gssize         content_size,
-                                              const char    *path,
-                                              GError       **error);
-void          flatpak_bwrap_add_bind_arg     (FlatpakBwrap  *bwrap,
-                                              const char    *type,
-                                              const char    *src,
-                                              const char    *dest);
-gboolean      flatpak_bwrap_bundle_args      (FlatpakBwrap  *bwrap,
-                                              int            start,
-                                              int            end,
-                                              gboolean       one_arg,
-                                              GError       **error);
+FlatpakBwrap *flatpak_bwrap_new (char **env);
+void          flatpak_bwrap_free (FlatpakBwrap *bwrap);
+void          flatpak_bwrap_set_env (FlatpakBwrap *bwrap,
+                                     const char   *variable,
+                                     const char   *value,
+                                     gboolean      overwrite);
+gboolean      flatpak_bwrap_is_empty (FlatpakBwrap *bwrap);
+void          flatpak_bwrap_finish (FlatpakBwrap *bwrap);
+void          flatpak_bwrap_unset_env (FlatpakBwrap *bwrap,
+                                       const char   *variable);
+void          flatpak_bwrap_add_arg (FlatpakBwrap *bwrap,
+                                     const char   *arg);
+void          flatpak_bwrap_add_noinherit_fd (FlatpakBwrap *bwrap,
+                                              int           fd);
+void          flatpak_bwrap_add_fd (FlatpakBwrap *bwrap,
+                                    int           fd);
+void          flatpak_bwrap_add_args (FlatpakBwrap *bwrap,
+                                      ...);
+void          flatpak_bwrap_add_arg_printf (FlatpakBwrap *bwrap,
+                                            const char   *format,
+                                            ...) G_GNUC_PRINTF (2, 3);
+void          flatpak_bwrap_append_argsv (FlatpakBwrap *bwrap,
+                                          char        **args,
+                                          int           len);
+void          flatpak_bwrap_append_bwrap (FlatpakBwrap *bwrap,
+                                          FlatpakBwrap *other);       /* Steals the fds */
+void          flatpak_bwrap_append_args (FlatpakBwrap *bwrap,
+                                         GPtrArray    *other_array);
+void          flatpak_bwrap_add_args_data_fd (FlatpakBwrap *bwrap,
+                                              const char   *op,
+                                              int           fd,
+                                              const char   *path_optional);
+gboolean      flatpak_bwrap_add_args_data (FlatpakBwrap *bwrap,
+                                           const char   *name,
+                                           const char   *content,
+                                           gssize        content_size,
+                                           const char   *path,
+                                           GError      **error);
+void          flatpak_bwrap_add_bind_arg (FlatpakBwrap *bwrap,
+                                          const char   *type,
+                                          const char   *src,
+                                          const char   *dest);
+gboolean      flatpak_bwrap_bundle_args (FlatpakBwrap *bwrap,
+                                         int           start,
+                                         int           end,
+                                         gboolean      one_arg,
+                                         GError      **error);
 
-void          flatpak_bwrap_child_setup_cb   (gpointer       user_data);
+void          flatpak_bwrap_child_setup_cb (gpointer user_data);
 
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakBwrap, flatpak_bwrap_free)
diff --git a/common/flatpak-bwrap.c b/common/flatpak-bwrap.c
index b5089de3..562673b3 100644
--- a/common/flatpak-bwrap.c
+++ b/common/flatpak-bwrap.c
@@ -44,6 +44,7 @@ static void
 clear_fd (gpointer data)
 {
   int *fd_p = data;
+
   if (fd_p != NULL && *fd_p != -1)
     close (*fd_p);
 }
@@ -80,15 +81,15 @@ flatpak_bwrap_free (FlatpakBwrap *bwrap)
 }
 
 gboolean
-flatpak_bwrap_is_empty (FlatpakBwrap  *bwrap)
+flatpak_bwrap_is_empty (FlatpakBwrap *bwrap)
 {
   return bwrap->argv->len == 0;
 }
 
 void
 flatpak_bwrap_set_env (FlatpakBwrap *bwrap,
-                       const char  *variable,
-                       const char  *value,
+                       const char   *variable,
+                       const char   *value,
                        gboolean      overwrite)
 {
   bwrap->envp = g_environ_setenv (bwrap->envp, variable, value, overwrite);
@@ -96,7 +97,7 @@ flatpak_bwrap_set_env (FlatpakBwrap *bwrap,
 
 void
 flatpak_bwrap_unset_env (FlatpakBwrap *bwrap,
-                         const char  *variable)
+                         const char   *variable)
 {
   bwrap->envp = g_environ_unsetenv (bwrap->envp, variable);
 }
@@ -108,21 +109,21 @@ flatpak_bwrap_add_arg (FlatpakBwrap *bwrap, const char *arg)
 }
 
 void
-flatpak_bwrap_finish (FlatpakBwrap  *bwrap)
+flatpak_bwrap_finish (FlatpakBwrap *bwrap)
 {
   g_ptr_array_add (bwrap->argv, NULL);
 }
 
 void
-flatpak_bwrap_add_noinherit_fd (FlatpakBwrap  *bwrap,
-                                int            fd)
+flatpak_bwrap_add_noinherit_fd (FlatpakBwrap *bwrap,
+                                int           fd)
 {
   g_array_append_val (bwrap->noinherit_fds, fd);
 }
 
 void
-flatpak_bwrap_add_fd (FlatpakBwrap  *bwrap,
-                      int            fd)
+flatpak_bwrap_add_fd (FlatpakBwrap *bwrap,
+                      int           fd)
 {
   g_array_append_val (bwrap->fds, fd);
 }
@@ -150,8 +151,8 @@ flatpak_bwrap_add_args (FlatpakBwrap *bwrap, ...)
 
 void
 flatpak_bwrap_append_argsv (FlatpakBwrap *bwrap,
-                            char **args,
-                            int len)
+                            char        **args,
+                            int           len)
 {
   int i;
 
@@ -164,19 +165,19 @@ flatpak_bwrap_append_argsv (FlatpakBwrap *bwrap,
 
 void
 flatpak_bwrap_append_args (FlatpakBwrap *bwrap,
-                           GPtrArray *other_array)
+                           GPtrArray    *other_array)
 {
   flatpak_bwrap_append_argsv (bwrap,
-                              (char **)other_array->pdata,
+                              (char **) other_array->pdata,
                               other_array->len);
 }
 
 static int *
-flatpak_bwrap_steal_fds (FlatpakBwrap  *bwrap,
-                         gsize         *len_out)
+flatpak_bwrap_steal_fds (FlatpakBwrap *bwrap,
+                         gsize        *len_out)
 {
   gsize len = bwrap->fds->len;
-  int *res = (int *)g_array_free (bwrap->fds, FALSE);
+  int *res = (int *) g_array_free (bwrap->fds, FALSE);
 
   bwrap->fds = g_array_new (FALSE, TRUE, sizeof (int));
   *len_out = len;
@@ -184,8 +185,8 @@ flatpak_bwrap_steal_fds (FlatpakBwrap  *bwrap,
 }
 
 void
-flatpak_bwrap_append_bwrap (FlatpakBwrap  *bwrap,
-                            FlatpakBwrap  *other)
+flatpak_bwrap_append_bwrap (FlatpakBwrap *bwrap,
+                            FlatpakBwrap *other)
 {
   g_autofree int *fds = NULL;
   gsize n_fds, i;
@@ -195,7 +196,7 @@ flatpak_bwrap_append_bwrap (FlatpakBwrap  *bwrap,
     flatpak_bwrap_add_fd (bwrap, fds[i]);
 
   flatpak_bwrap_append_argsv (bwrap,
-                              (char **)other->argv->pdata,
+                              (char **) other->argv->pdata,
                               other->argv->len);
 
   for (i = 0; other->envp[i] != NULL; i++)
@@ -213,9 +214,9 @@ flatpak_bwrap_append_bwrap (FlatpakBwrap  *bwrap,
 
 void
 flatpak_bwrap_add_args_data_fd (FlatpakBwrap *bwrap,
-                                const char *op,
-                                int fd,
-                                const char *path_optional)
+                                const char   *op,
+                                int           fd,
+                                const char   *path_optional)
 {
   g_autofree char *fd_str = g_strdup_printf ("%d", fd);
 
@@ -233,11 +234,11 @@ flatpak_bwrap_add_args_data_fd (FlatpakBwrap *bwrap,
  */
 gboolean
 flatpak_bwrap_add_args_data (FlatpakBwrap *bwrap,
-                             const char *name,
-                             const char *content,
-                             gssize content_size,
-                             const char *path,
-                             GError **error)
+                             const char   *name,
+                             const char   *content,
+                             gssize        content_size,
+                             const char   *path,
+                             GError      **error)
 {
   g_auto(GLnxTmpfile) args_tmpf  = { 0, };
 
@@ -257,9 +258,9 @@ flatpak_bwrap_add_args_data (FlatpakBwrap *bwrap,
  */
 void
 flatpak_bwrap_add_bind_arg (FlatpakBwrap *bwrap,
-                            const char *type,
-                            const char *src,
-                            const char *dest)
+                            const char   *type,
+                            const char   *src,
+                            const char   *dest)
 {
   g_autofree char *dest_dirname = g_path_get_dirname (dest);
   g_autofree char *dest_dirname_real = realpath (dest_dirname, NULL);
@@ -273,17 +274,18 @@ flatpak_bwrap_add_bind_arg (FlatpakBwrap *bwrap,
 }
 
 gboolean
-flatpak_bwrap_bundle_args (FlatpakBwrap  *bwrap,
-                           int            start,
-                           int            end,
-                           gboolean       one_arg,
-                           GError       **error)
+flatpak_bwrap_bundle_args (FlatpakBwrap *bwrap,
+                           int           start,
+                           int           end,
+                           gboolean      one_arg,
+                           GError      **error)
 {
   gchar *data;
   gchar *ptr;
   gint i;
   gsize data_len = 0;
   int fd;
+
   g_auto(GLnxTmpfile) args_tmpf  = { 0, };
 
   if (end == -1)
@@ -317,7 +319,7 @@ flatpak_bwrap_bundle_args (FlatpakBwrap  *bwrap,
   else
     {
       g_ptr_array_insert (bwrap->argv, start, g_strdup ("--args"));
-      g_ptr_array_insert (bwrap->argv, start+1, g_strdup_printf ("%d", fd));
+      g_ptr_array_insert (bwrap->argv, start + 1, g_strdup_printf ("%d", fd));
     }
 
   return TRUE;
diff --git a/common/flatpak-common-types-private.h b/common/flatpak-common-types-private.h
index afbeddb8..8c40d2e8 100644
--- a/common/flatpak-common-types-private.h
+++ b/common/flatpak-common-types-private.h
@@ -46,10 +46,10 @@ typedef enum {
   FLATPAK_RUN_FLAG_BLUETOOTH          = (1 << 16),
 } FlatpakRunFlags;
 
-typedef struct FlatpakDir     FlatpakDir;
-typedef struct FlatpakDeploy  FlatpakDeploy;
-typedef struct FlatpakOciRegistry FlatpakOciRegistry;
+typedef struct FlatpakDir          FlatpakDir;
+typedef struct FlatpakDeploy       FlatpakDeploy;
+typedef struct FlatpakOciRegistry  FlatpakOciRegistry;
 typedef struct _FlatpakOciManifest FlatpakOciManifest;
-typedef struct FlatpakCompletion FlatpakCompletion;
+typedef struct FlatpakCompletion   FlatpakCompletion;
 
 #endif /* __FLATPAK_COMMON_TYPES_H__ */
diff --git a/common/flatpak-context-private.h b/common/flatpak-context-private.h
index ff850147..d62ce9e2 100644
--- a/common/flatpak-context-private.h
+++ b/common/flatpak-context-private.h
@@ -57,20 +57,20 @@ typedef enum {
 
 struct FlatpakContext
 {
-  FlatpakContextShares  shares;
-  FlatpakContextShares  shares_valid;
-  FlatpakContextSockets sockets;
-  FlatpakContextSockets sockets_valid;
-  FlatpakContextDevices devices;
-  FlatpakContextDevices devices_valid;
-  FlatpakContextFeatures  features;
-  FlatpakContextFeatures  features_valid;
-  GHashTable           *env_vars;
-  GHashTable           *persistent;
-  GHashTable           *filesystems;
-  GHashTable           *session_bus_policy;
-  GHashTable           *system_bus_policy;
-  GHashTable           *generic_policy;
+  FlatpakContextShares   shares;
+  FlatpakContextShares   shares_valid;
+  FlatpakContextSockets  sockets;
+  FlatpakContextSockets  sockets_valid;
+  FlatpakContextDevices  devices;
+  FlatpakContextDevices  devices_valid;
+  FlatpakContextFeatures features;
+  FlatpakContextFeatures features_valid;
+  GHashTable            *env_vars;
+  GHashTable            *persistent;
+  GHashTable            *filesystems;
+  GHashTable            *session_bus_policy;
+  GHashTable            *system_bus_policy;
+  GHashTable            *generic_policy;
 };
 
 extern const char *flatpak_context_sockets[];
@@ -99,7 +99,7 @@ void           flatpak_context_set_system_bus_policy (FlatpakContext *context,
                                                       const char     *name,
                                                       FlatpakPolicy   policy);
 void           flatpak_context_to_args (FlatpakContext *context,
-                                        GPtrArray *args);
+                                        GPtrArray      *args);
 FlatpakRunFlags flatpak_context_get_run_flags (FlatpakContext *context);
 void           flatpak_context_add_bus_filters (FlatpakContext *context,
                                                 const char     *app_id,
@@ -112,21 +112,21 @@ gboolean       flatpak_context_get_needs_system_bus_proxy (FlatpakContext *conte
 void           flatpak_context_reset_permissions (FlatpakContext *context);
 void           flatpak_context_make_sandboxed (FlatpakContext *context);
 
-gboolean       flatpak_context_allows_features (FlatpakContext *context,
+gboolean       flatpak_context_allows_features (FlatpakContext        *context,
                                                 FlatpakContextFeatures features);
 
 FlatpakContext *flatpak_context_load_for_deploy (FlatpakDeploy *deploy,
-                                                 GError        **error);
-FlatpakContext *flatpak_context_load_for_app (const char     *app_id,
-                                              GError        **error);
+                                                 GError       **error);
+FlatpakContext *flatpak_context_load_for_app (const char *app_id,
+                                              GError    **error);
 
 FlatpakExports *flatpak_context_get_exports (FlatpakContext *context,
-                                             const char *app_id);
+                                             const char     *app_id);
 
-void flatpak_context_append_bwrap_filesystem (FlatpakContext *context,
-                                              FlatpakBwrap *bwrap,
-                                              const char *app_id,
-                                              GFile *app_id_dir,
+void flatpak_context_append_bwrap_filesystem (FlatpakContext  *context,
+                                              FlatpakBwrap    *bwrap,
+                                              const char      *app_id,
+                                              GFile           *app_id_dir,
                                               FlatpakExports **exports_out);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakContext, flatpak_context_free)
diff --git a/common/flatpak-context.c b/common/flatpak-context.c
index 241023d9..b235ec0f 100644
--- a/common/flatpak-context.c
+++ b/common/flatpak-context.c
@@ -89,7 +89,7 @@ flatpak_context_new (void)
   context->session_bus_policy = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
   context->system_bus_policy = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
   context->generic_policy = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                                   g_free, (GDestroyNotify)g_strfreev);
+                                                   g_free, (GDestroyNotify) g_strfreev);
 
   return context;
 }
@@ -172,7 +172,7 @@ flatpak_context_share_from_string (const char *string, GError **error)
 
   if (shares == 0)
     {
-      g_autofree char *values = g_strjoinv (", ", (char **)flatpak_context_shares);
+      g_autofree char *values = g_strjoinv (", ", (char **) flatpak_context_shares);
       g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
                    _("Unknown share type %s, valid types are: %s"), string, values);
     }
@@ -189,7 +189,7 @@ flatpak_context_shared_to_string (FlatpakContextShares shares, FlatpakContextSha
 static void
 flatpak_context_shared_to_args (FlatpakContextShares shares,
                                 FlatpakContextShares valid,
-                                GPtrArray *args)
+                                GPtrArray           *args)
 {
   return flatpak_context_bitmask_to_args (shares, valid, flatpak_context_shares, "--share", "--unshare", args);
 }
@@ -207,7 +207,7 @@ flatpak_policy_from_string (const char *string, GError **error)
         return i;
     }
 
-  values = g_strjoinv (", ", (char **)policies);
+  values = g_strjoinv (", ", (char **) policies);
   g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
                _("Unknown policy type %s, valid types are: %s"), string, values);
 
@@ -258,7 +258,7 @@ flatpak_context_socket_from_string (const char *string, GError **error)
 
   if (sockets == 0)
     {
-      g_autofree char *values = g_strjoinv (", ", (char **)flatpak_context_sockets);
+      g_autofree char *values = g_strjoinv (", ", (char **) flatpak_context_sockets);
       g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
                    _("Unknown socket type %s, valid types are: %s"), string, values);
     }
@@ -275,7 +275,7 @@ flatpak_context_sockets_to_string (FlatpakContextSockets sockets, FlatpakContext
 static void
 flatpak_context_sockets_to_args (FlatpakContextSockets sockets,
                                  FlatpakContextSockets valid,
-                                 GPtrArray *args)
+                                 GPtrArray            *args)
 {
   return flatpak_context_bitmask_to_args (sockets, valid, flatpak_context_sockets, "--socket", "--nosocket", args);
 }
@@ -287,7 +287,7 @@ flatpak_context_device_from_string (const char *string, GError **error)
 
   if (devices == 0)
     {
-      g_autofree char *values = g_strjoinv (", ", (char **)flatpak_context_devices);
+      g_autofree char *values = g_strjoinv (", ", (char **) flatpak_context_devices);
       g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
                    _("Unknown device type %s, valid types are: %s"), string, values);
     }
@@ -303,7 +303,7 @@ flatpak_context_devices_to_string (FlatpakContextDevices devices, FlatpakContext
 static void
 flatpak_context_devices_to_args (FlatpakContextDevices devices,
                                  FlatpakContextDevices valid,
-                                 GPtrArray *args)
+                                 GPtrArray            *args)
 {
   return flatpak_context_bitmask_to_args (devices, valid, flatpak_context_devices, "--device", "--nodevice", args);
 }
@@ -315,7 +315,7 @@ flatpak_context_feature_from_string (const char *string, GError **error)
 
   if (feature == 0)
     {
-      g_autofree char *values = g_strjoinv (", ", (char **)flatpak_context_features);
+      g_autofree char *values = g_strjoinv (", ", (char **) flatpak_context_features);
       g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
                    _("Unknown feature type %s, valid types are: %s"), string, values);
     }
@@ -331,8 +331,8 @@ flatpak_context_features_to_string (FlatpakContextFeatures features, FlatpakCont
 
 static void
 flatpak_context_features_to_args (FlatpakContextFeatures features,
-                                FlatpakContextFeatures valid,
-                                GPtrArray *args)
+                                  FlatpakContextFeatures valid,
+                                  GPtrArray             *args)
 {
   return flatpak_context_bitmask_to_args (features, valid, flatpak_context_features, "--allow", "--disallow", args);
 }
@@ -386,16 +386,16 @@ flatpak_context_remove_devices (FlatpakContext       *context,
 }
 
 static void
-flatpak_context_add_features (FlatpakContext       *context,
-                           FlatpakContextFeatures   features)
+flatpak_context_add_features (FlatpakContext        *context,
+                              FlatpakContextFeatures features)
 {
   context->features_valid |= features;
   context->features |= features;
 }
 
 static void
-flatpak_context_remove_features (FlatpakContext       *context,
-                               FlatpakContextFeatures  features)
+flatpak_context_remove_features (FlatpakContext        *context,
+                                 FlatpakContextFeatures features)
 {
   context->features_valid |= features;
   context->features &= ~features;
@@ -422,6 +422,7 @@ flatpak_context_get_session_bus_policy_allowed_own_names (FlatpakContext *contex
 {
   GHashTableIter iter;
   gpointer key, value;
+
   g_autoptr(GPtrArray) names = g_ptr_array_new_with_free_func (g_free);
 
   g_hash_table_iter_init (&iter, context->session_bus_policy);
@@ -481,7 +482,7 @@ flatpak_context_set_persistent (FlatpakContext *context,
 }
 
 static gboolean
-get_xdg_dir_from_prefix (const char *prefix,
+get_xdg_dir_from_prefix (const char  *prefix,
                          const char **where,
                          const char **dir)
 {
@@ -515,7 +516,7 @@ get_xdg_dir_from_prefix (const char *prefix,
 /* This looks only in the xdg dirs (config, cache, data), not the user
    definable ones */
 static char *
-get_xdg_dir_from_string (const char *filesystem,
+get_xdg_dir_from_string (const char  *filesystem,
                          const char **suffix,
                          const char **where)
 {
@@ -659,7 +660,7 @@ get_xdg_user_dir_from_string (const char  *filesystem,
 }
 
 static char *
-unparse_filesystem_flags (const char *path,
+unparse_filesystem_flags (const char           *path,
                           FlatpakFilesystemMode mode)
 {
   g_autoptr(GString) s = g_string_new ("");
@@ -680,11 +681,14 @@ unparse_filesystem_flags (const char *path,
     case FLATPAK_FILESYSTEM_MODE_READ_ONLY:
       g_string_append (s, ":ro");
       break;
+
     case FLATPAK_FILESYSTEM_MODE_CREATE:
       g_string_append (s, ":create");
       break;
+
     case FLATPAK_FILESYSTEM_MODE_READ_WRITE:
       break;
+
     default:
       g_warning ("Unexpected filesystem mode %d", mode);
       break;
@@ -694,7 +698,7 @@ unparse_filesystem_flags (const char *path,
 }
 
 static char *
-parse_filesystem_flags (const char *filesystem,
+parse_filesystem_flags (const char            *filesystem,
                         FlatpakFilesystemMode *mode_out)
 {
   g_autoptr(GString) s = g_string_new ("");
@@ -824,11 +828,11 @@ flatpak_context_merge (FlatpakContext *context,
   g_hash_table_iter_init (&iter, other->generic_policy);
   while (g_hash_table_iter_next (&iter, &key, &value))
     {
-      const char **policy_values = (const char **)value;
+      const char **policy_values = (const char **) value;
       int i;
 
       for (i = 0; policy_values[i] != NULL; i++)
-        flatpak_context_apply_generic_policy (context, (char *)key, policy_values[i]);
+        flatpak_context_apply_generic_policy (context, (char *) key, policy_values[i]);
     }
 
 }
@@ -1242,6 +1246,7 @@ flatpak_context_load_metadata (FlatpakContext *context,
                                GError        **error)
 {
   gboolean remove;
+
   g_auto(GStrv) groups = NULL;
   int i;
 
@@ -1317,7 +1322,7 @@ flatpak_context_load_metadata (FlatpakContext *context,
   if (g_key_file_has_key (metakey, FLATPAK_METADATA_GROUP_CONTEXT, FLATPAK_METADATA_KEY_FEATURES, NULL))
     {
       g_auto(GStrv) features = g_key_file_get_string_list (metakey, FLATPAK_METADATA_GROUP_CONTEXT,
-                                                         FLATPAK_METADATA_KEY_FEATURES, NULL, error);
+                                                           FLATPAK_METADATA_KEY_FEATURES, NULL, error);
       if (features == NULL)
         return FALSE;
 
@@ -1491,7 +1496,7 @@ flatpak_context_save_metadata (FlatpakContext *context,
       /* A flattened format means we don't expect this to be merged on top of
          another context. In that case we never need to negate any flags.
          We calculate this by removing the zero parts of the mask from the valid set.
-      */
+       */
       /* First we make sure only the valid parts of the mask are set, in case we
          got some leftover */
       shares_mask &= shares_valid;
@@ -1659,10 +1664,10 @@ flatpak_context_save_metadata (FlatpakContext *context,
   g_hash_table_iter_init (&iter, context->generic_policy);
   while (g_hash_table_iter_next (&iter, &key, &value))
     {
-      g_auto(GStrv) parts = g_strsplit ((const char *)key, ".", 2);
+      g_auto(GStrv) parts = g_strsplit ((const char *) key, ".", 2);
       g_autofree char *group = NULL;
       g_assert (parts[1] != NULL);
-      const char **policy_values = (const char **)value;
+      const char **policy_values = (const char **) value;
       g_autoptr(GPtrArray) new = g_ptr_array_new ();
 
       for (i = 0; policy_values[i] != NULL; i++)
@@ -1670,7 +1675,7 @@ flatpak_context_save_metadata (FlatpakContext *context,
           const char *policy_value = policy_values[i];
 
           if (!flatten || policy_value[0] != '!')
-            g_ptr_array_add (new, (char *)policy_value);
+            g_ptr_array_add (new, (char *) policy_value);
         }
 
       if (new->len > 0)
@@ -1678,7 +1683,7 @@ flatpak_context_save_metadata (FlatpakContext *context,
           group = g_strconcat (FLATPAK_METADATA_GROUP_PREFIX_POLICY,
                                parts[0], NULL);
           g_key_file_set_string_list (metakey, group, parts[1],
-                                      (const char * const*)new->pdata,
+                                      (const char * const *) new->pdata,
                                       new->len);
         }
     }
@@ -1703,7 +1708,7 @@ flatpak_context_get_needs_system_bus_proxy (FlatpakContext *context)
 }
 
 gboolean
-flatpak_context_allows_features (FlatpakContext *context,
+flatpak_context_allows_features (FlatpakContext        *context,
                                  FlatpakContextFeatures features)
 {
   return (context->features & features) == features;
@@ -1711,7 +1716,7 @@ flatpak_context_allows_features (FlatpakContext *context,
 
 void
 flatpak_context_to_args (FlatpakContext *context,
-                         GPtrArray *args)
+                         GPtrArray      *args)
 {
   GHashTableIter iter;
   gpointer key, value;
@@ -1723,11 +1728,11 @@ flatpak_context_to_args (FlatpakContext *context,
 
   g_hash_table_iter_init (&iter, context->env_vars);
   while (g_hash_table_iter_next (&iter, &key, &value))
-    g_ptr_array_add (args, g_strdup_printf ("--env=%s=%s", (char *)key, (char *)value));
+    g_ptr_array_add (args, g_strdup_printf ("--env=%s=%s", (char *) key, (char *) value));
 
   g_hash_table_iter_init (&iter, context->persistent);
   while (g_hash_table_iter_next (&iter, &key, &value))
-    g_ptr_array_add (args, g_strdup_printf ("--persist=%s", (char *)key));
+    g_ptr_array_add (args, g_strdup_printf ("--persist=%s", (char *) key));
 
   g_hash_table_iter_init (&iter, context->session_bus_policy);
   while (g_hash_table_iter_next (&iter, &key, &value))
@@ -1758,7 +1763,7 @@ flatpak_context_to_args (FlatpakContext *context,
           g_ptr_array_add (args, g_strdup_printf ("--filesystem=%s", fs));
         }
       else
-        g_ptr_array_add (args, g_strdup_printf ("--nofilesystem=%s", (char *)key));
+        g_ptr_array_add (args, g_strdup_printf ("--nofilesystem=%s", (char *) key));
     }
 }
 
@@ -1844,10 +1849,10 @@ const char *dont_mount_in_root[] = {
 static void
 flatpak_context_export (FlatpakContext *context,
                         FlatpakExports *exports,
-                        GFile *app_id_dir,
-                        gboolean do_create,
-                        GString *xdg_dirs_conf,
-                        gboolean *home_access_out)
+                        GFile          *app_id_dir,
+                        gboolean        do_create,
+                        GString        *xdg_dirs_conf,
+                        gboolean       *home_access_out)
 {
   gboolean home_access = FALSE;
   FlatpakFilesystemMode fs_mode, home_mode;
@@ -1982,7 +1987,7 @@ flatpak_context_export (FlatpakContext *context,
 
 FlatpakExports *
 flatpak_context_get_exports (FlatpakContext *context,
-                             const char *app_id)
+                             const char     *app_id)
 {
   g_autoptr(FlatpakExports) exports = flatpak_exports_new ();
   g_autoptr(GFile) app_id_dir = flatpak_get_data_dir (app_id);
@@ -2009,10 +2014,10 @@ flatpak_context_get_run_flags (FlatpakContext *context)
 }
 
 void
-flatpak_context_append_bwrap_filesystem (FlatpakContext *context,
-                                         FlatpakBwrap *bwrap,
-                                         const char *app_id,
-                                         GFile *app_id_dir,
+flatpak_context_append_bwrap_filesystem (FlatpakContext  *context,
+                                         FlatpakBwrap    *bwrap,
+                                         const char      *app_id,
+                                         GFile           *app_id_dir,
                                          FlatpakExports **exports_out)
 {
   g_autoptr(FlatpakExports) exports = flatpak_exports_new ();
diff --git a/common/flatpak-dir-private.h b/common/flatpak-dir-private.h
index cd82305a..2c9b5a41 100644
--- a/common/flatpak-dir-private.h
+++ b/common/flatpak-dir-private.h
@@ -65,13 +65,13 @@ GType flatpak_deploy_get_type (void);
 
 typedef struct
 {
-  char           *collection_id;  /* (nullable) */
-  char           *ref;
-  char           *commit;
-  char          **subpaths;
-  gboolean        download;
+  char    *collection_id;         /* (nullable) */
+  char    *ref;
+  char    *commit;
+  char   **subpaths;
+  gboolean download;
   gboolean        delete;
-  gboolean        auto_prune;
+  gboolean auto_prune;
 } FlatpakRelated;
 
 void         flatpak_related_free (FlatpakRelated *related);
@@ -84,30 +84,30 @@ void         flatpak_related_free (FlatpakRelated *related);
    if it happened to change in the middle of the operation */
 typedef struct
 {
-  char *remote_name;
-  char *collection_id;
+  char     *remote_name;
+  char     *collection_id;
   GVariant *summary;
-  GBytes *summary_sig_bytes;
-  GError *summary_fetch_error;
+  GBytes   *summary_sig_bytes;
+  GError   *summary_fetch_error;
   GVariant *metadata;
-  GError *metadata_fetch_error;
+  GError   *metadata_fetch_error;
 } FlatpakRemoteState;
 
 void flatpak_remote_state_free (FlatpakRemoteState *remote_state);
 gboolean flatpak_remote_state_ensure_summary (FlatpakRemoteState *self,
-                                              GError      **error);
+                                              GError            **error);
 gboolean flatpak_remote_state_ensure_metadata (FlatpakRemoteState *self,
-                                               GError      **error);
+                                               GError            **error);
 gboolean flatpak_remote_state_lookup_ref (FlatpakRemoteState *self,
                                           const char         *ref,
                                           char              **out_checksum,
                                           GVariant          **out_variant,
                                           GError            **error);
 char **flatpak_remote_state_match_subrefs (FlatpakRemoteState *self,
-                                           const   char *ref);
+                                           const char         *ref);
 gboolean flatpak_remote_state_lookup_repo_metadata (FlatpakRemoteState *self,
-                                                    const char    *key,
-                                                    const char    *format_string,
+                                                    const char         *key,
+                                                    const char         *format_string,
                                                     ...);
 gboolean flatpak_remote_state_lookup_cache (FlatpakRemoteState *self,
                                             const char         *ref,
@@ -117,7 +117,7 @@ gboolean flatpak_remote_state_lookup_cache (FlatpakRemoteState *self,
                                             GError            **error);
 GVariant *flatpak_remote_state_lookup_sparse_cache (FlatpakRemoteState *self,
                                                     const char         *ref,
-                                                    GError             **error);
+                                                    GError            **error);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakDir, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakDeploy, g_object_unref)
@@ -126,14 +126,14 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakRemoteState, flatpak_remote_state_free)
 
 typedef struct
 {
-  char           *collection_id;
-  char           *ref_name;
+  char *collection_id;
+  char *ref_name;
 } FlatpakCollectionRef;
 
-FlatpakCollectionRef *    flatpak_collection_ref_new  (const char *collection_id,
-                                                       const char *ref_name);
-void                      flatpak_collection_ref_free  (FlatpakCollectionRef *ref);
-guint                     flatpak_collection_ref_hash  (gconstpointer ref);
+FlatpakCollectionRef *    flatpak_collection_ref_new (const char *collection_id,
+                                                      const char *ref_name);
+void                      flatpak_collection_ref_free (FlatpakCollectionRef *ref);
+guint                     flatpak_collection_ref_hash (gconstpointer ref);
 gboolean                  flatpak_collection_ref_equal (gconstpointer ref1,
                                                         gconstpointer ref2);
 
@@ -147,7 +147,7 @@ typedef enum {
   FLATPAK_HELPER_DEPLOY_FLAGS_REINSTALL = 1 << 3,
 } FlatpakHelperDeployFlags;
 
-#define FLATPAK_HELPER_DEPLOY_FLAGS_ALL (FLATPAK_HELPER_DEPLOY_FLAGS_UPDATE|FLATPAK_HELPER_DEPLOY_FLAGS_NO_DEPLOY|FLATPAK_HELPER_DEPLOY_FLAGS_LOCAL_PULL|FLATPAK_HELPER_DEPLOY_FLAGS_REINSTALL)
+#define FLATPAK_HELPER_DEPLOY_FLAGS_ALL (FLATPAK_HELPER_DEPLOY_FLAGS_UPDATE | FLATPAK_HELPER_DEPLOY_FLAGS_NO_DEPLOY | FLATPAK_HELPER_DEPLOY_FLAGS_LOCAL_PULL | FLATPAK_HELPER_DEPLOY_FLAGS_REINSTALL)
 
 typedef enum {
   FLATPAK_HELPER_UNINSTALL_FLAGS_NONE = 0,
@@ -233,12 +233,12 @@ const char *        flatpak_deploy_data_get_eol_rebase (GVariant *deploy_data);
 const char *        flatpak_deploy_data_get_runtime (GVariant *deploy_data);
 
 GFile *        flatpak_deploy_get_dir (FlatpakDeploy *deploy);
-GVariant *     flatpak_load_deploy_data (GFile *deploy_dir,
+GVariant *     flatpak_load_deploy_data (GFile        *deploy_dir,
                                          GCancellable *cancellable,
                                          GError      **error);
 GVariant *     flatpak_deploy_get_deploy_data (FlatpakDeploy *deploy,
-                                               GCancellable *cancellable,
-                                               GError      **error);
+                                               GCancellable  *cancellable,
+                                               GError       **error);
 GFile *        flatpak_deploy_get_files (FlatpakDeploy *deploy);
 FlatpakContext *flatpak_deploy_get_overrides (FlatpakDeploy *deploy);
 GKeyFile *     flatpak_deploy_get_metadata (FlatpakDeploy *deploy);
@@ -265,8 +265,8 @@ gint        flatpak_dir_get_priority (FlatpakDir *self);
 FlatpakDirStorageType flatpak_dir_get_storage_type (FlatpakDir *self);
 GFile *     flatpak_dir_get_deploy_dir (FlatpakDir *self,
                                         const char *ref);
-char *      flatpak_dir_get_deploy_subdir (FlatpakDir *self,
-                                           const char *checksum,
+char *      flatpak_dir_get_deploy_subdir (FlatpakDir          *self,
+                                           const char          *checksum,
                                            const char * const * subpaths);
 GFile *     flatpak_dir_get_unmaintained_extension_dir (FlatpakDir *self,
                                                         const char *name,
@@ -290,10 +290,10 @@ GFile *     flatpak_dir_get_if_deployed (FlatpakDir   *self,
                                          const char   *ref,
                                          const char   *checksum,
                                          GCancellable *cancellable);
-GFile *     flatpak_dir_get_unmaintained_extension_dir_if_exists (FlatpakDir *self,
-                                                                  const char *name,
-                                                                  const char *arch,
-                                                                  const char *branch,
+GFile *     flatpak_dir_get_unmaintained_extension_dir_if_exists (FlatpakDir   *self,
+                                                                  const char   *name,
+                                                                  const char   *arch,
+                                                                  const char   *branch,
                                                                   GCancellable *cancellable);
 
 char **     flatpak_dir_search_for_local_dependency (FlatpakDir   *self,
@@ -332,13 +332,13 @@ char *      flatpak_dir_find_local_ref (FlatpakDir   *self,
                                         FlatpakKinds *out_kind,
                                         GCancellable *cancellable,
                                         GError      **error);
-char *      flatpak_dir_find_installed_ref (FlatpakDir  *self,
-                                            const char  *opt_name,
-                                            const char  *opt_branch,
-                                            const char  *opt_arch,
-                                            FlatpakKinds kinds,
+char *      flatpak_dir_find_installed_ref (FlatpakDir   *self,
+                                            const char   *opt_name,
+                                            const char   *opt_branch,
+                                            const char   *opt_arch,
+                                            FlatpakKinds  kinds,
                                             FlatpakKinds *out_kind,
-                                            GError     **error);
+                                            GError      **error);
 char **     flatpak_dir_find_installed_refs (FlatpakDir  *self,
                                              const char  *opt_name,
                                              const char  *opt_branch,
@@ -371,8 +371,8 @@ gboolean    flatpak_dir_maybe_ensure_repo (FlatpakDir   *self,
                                            GCancellable *cancellable,
                                            GError      **error);
 char *      flatpak_dir_get_config (FlatpakDir *self,
-				    const char *key,
-				    GError    **error);
+                                    const char *key,
+                                    GError    **error);
 gboolean    flatpak_dir_set_config (FlatpakDir *self,
                                     const char *key,
                                     const char *value,
@@ -383,12 +383,12 @@ gboolean    flatpak_dir_remove_appstream (FlatpakDir   *self,
                                           const char   *remote,
                                           GCancellable *cancellable,
                                           GError      **error);
-gboolean    flatpak_dir_deploy_appstream (FlatpakDir          *self,
-                                          const char          *remote,
-                                          const char          *arch,
-                                          gboolean            *out_changed,
-                                          GCancellable        *cancellable,
-                                          GError             **error);
+gboolean    flatpak_dir_deploy_appstream (FlatpakDir   *self,
+                                          const char   *remote,
+                                          const char   *arch,
+                                          gboolean     *out_changed,
+                                          GCancellable *cancellable,
+                                          GError      **error);
 gboolean    flatpak_dir_update_appstream (FlatpakDir          *self,
                                           const char          *remote,
                                           const char          *arch,
@@ -396,23 +396,23 @@ gboolean    flatpak_dir_update_appstream (FlatpakDir          *self,
                                           OstreeAsyncProgress *progress,
                                           GCancellable        *cancellable,
                                           GError             **error);
-gboolean    flatpak_dir_pull (FlatpakDir          *self,
-                              FlatpakRemoteState  *state,
-                              const char          *ref,
-                              const char          *opt_rev,
+gboolean    flatpak_dir_pull (FlatpakDir                           *self,
+                              FlatpakRemoteState                   *state,
+                              const char                           *ref,
+                              const char                           *opt_rev,
                               const OstreeRepoFinderResult * const *results,
-                              const char         **subpaths,
-                              OstreeRepo          *repo,
-                              FlatpakPullFlags     flatpak_flags,
-                              OstreeRepoPullFlags  flags,
-                              OstreeAsyncProgress *progress,
-                              GCancellable        *cancellable,
-                              GError             **error);
+                              const char                          **subpaths,
+                              OstreeRepo                           *repo,
+                              FlatpakPullFlags                      flatpak_flags,
+                              OstreeRepoPullFlags                   flags,
+                              OstreeAsyncProgress                  *progress,
+                              GCancellable                         *cancellable,
+                              GError                              **error);
 gboolean    flatpak_dir_pull_untrusted_local (FlatpakDir          *self,
                                               const char          *src_path,
                                               const char          *remote_name,
                                               const char          *ref,
-                                              const char        **subpaths,
+                                              const char         **subpaths,
                                               OstreeAsyncProgress *progress,
                                               GCancellable        *cancellable,
                                               GError             **error);
@@ -483,7 +483,7 @@ gboolean    flatpak_dir_deploy (FlatpakDir          *self,
 gboolean    flatpak_dir_deploy_update (FlatpakDir   *self,
                                        const char   *ref,
                                        const char   *checksum,
-                                       const char **opt_subpaths,
+                                       const char  **opt_subpaths,
                                        GCancellable *cancellable,
                                        GError      **error);
 gboolean   flatpak_dir_deploy_install (FlatpakDir   *self,
@@ -505,53 +505,53 @@ gboolean   flatpak_dir_install (FlatpakDir          *self,
                                 OstreeAsyncProgress *progress,
                                 GCancellable        *cancellable,
                                 GError             **error);
-char *flatpak_dir_ensure_bundle_remote (FlatpakDir          *self,
-                                        GFile               *file,
-                                        GBytes              *extra_gpg_data,
-                                        char               **out_ref,
-                                        char               **out_commit,
-                                        char               **out_metadata,
-                                        gboolean            *out_created_remote,
-                                        GCancellable        *cancellable,
-                                        GError             **error);
-gboolean flatpak_dir_install_bundle (FlatpakDir          *self,
-                                     GFile               *file,
-                                     const char          *remote,
-                                     char               **out_ref,
-                                     GCancellable        *cancellable,
-                                     GError             **error);
-gboolean flatpak_dir_needs_update_for_commit_and_subpaths (FlatpakDir          *self,
-                                                           const char          *remote,
-                                                           const char          *ref,
-                                                           const char          *target_commit,
-                                                           const char         **opt_subpaths);
-char * flatpak_dir_check_for_update (FlatpakDir          *self,
-                                     FlatpakRemoteState  *state,
-                                     const char          *ref,
-                                     const char          *checksum_or_latest,
-                                     const char         **opt_subpaths,
-                                     gboolean             no_pull,
+char *flatpak_dir_ensure_bundle_remote (FlatpakDir   *self,
+                                        GFile        *file,
+                                        GBytes       *extra_gpg_data,
+                                        char        **out_ref,
+                                        char        **out_commit,
+                                        char        **out_metadata,
+                                        gboolean     *out_created_remote,
+                                        GCancellable *cancellable,
+                                        GError      **error);
+gboolean flatpak_dir_install_bundle (FlatpakDir   *self,
+                                     GFile        *file,
+                                     const char   *remote,
+                                     char        **out_ref,
+                                     GCancellable *cancellable,
+                                     GError      **error);
+gboolean flatpak_dir_needs_update_for_commit_and_subpaths (FlatpakDir  *self,
+                                                           const char  *remote,
+                                                           const char  *ref,
+                                                           const char  *target_commit,
+                                                           const char **opt_subpaths);
+char * flatpak_dir_check_for_update (FlatpakDir               *self,
+                                     FlatpakRemoteState       *state,
+                                     const char               *ref,
+                                     const char               *checksum_or_latest,
+                                     const char              **opt_subpaths,
+                                     gboolean                  no_pull,
                                      OstreeRepoFinderResult ***out_results,
-                                     GCancellable        *cancellable,
-                                     GError             **error);
-gboolean   flatpak_dir_update (FlatpakDir          *self,
-                               gboolean             no_pull,
-                               gboolean             no_deploy,
-                               gboolean             no_static_deltas,
-                               gboolean             allow_downgrade,
-                               FlatpakRemoteState  *state,
-                               const char          *ref,
-                               const char          *checksum_or_latest,
+                                     GCancellable             *cancellable,
+                                     GError                  **error);
+gboolean   flatpak_dir_update (FlatpakDir                           *self,
+                               gboolean                              no_pull,
+                               gboolean                              no_deploy,
+                               gboolean                              no_static_deltas,
+                               gboolean                              allow_downgrade,
+                               FlatpakRemoteState                   *state,
+                               const char                           *ref,
+                               const char                           *checksum_or_latest,
                                const OstreeRepoFinderResult * const *results,
-                               const char         **opt_subpaths,
-                               OstreeAsyncProgress *progress,
-                               GCancellable        *cancellable,
-                               GError             **error);
-gboolean flatpak_dir_uninstall (FlatpakDir          *self,
-                                const char          *ref,
+                               const char                          **opt_subpaths,
+                               OstreeAsyncProgress                  *progress,
+                               GCancellable                         *cancellable,
+                               GError                              **error);
+gboolean flatpak_dir_uninstall (FlatpakDir                 *self,
+                                const char                 *ref,
                                 FlatpakHelperUninstallFlags flags,
-                                GCancellable        *cancellable,
-                                GError             **error);
+                                GCancellable               *cancellable,
+                                GError                    **error);
 gboolean    flatpak_dir_undeploy (FlatpakDir   *self,
                                   const char   *ref,
                                   const char   *checksum,
@@ -601,8 +601,8 @@ gboolean    flatpak_dir_collect_unmaintained_refs (FlatpakDir   *self,
                                                    GHashTable   *hash,
                                                    GCancellable *cancellable,
                                                    GError      **error);
-gboolean   flatpak_dir_remote_has_deploys (FlatpakDir   *self,
-                                           const char   *remote);
+gboolean   flatpak_dir_remote_has_deploys (FlatpakDir *self,
+                                           const char *remote);
 char      *flatpak_dir_create_origin_remote (FlatpakDir   *self,
                                              const char   *url,
                                              const char   *id,
@@ -614,16 +614,16 @@ char      *flatpak_dir_create_origin_remote (FlatpakDir   *self,
                                              GError      **error);
 void       flatpak_dir_prune_origin_remote (FlatpakDir *self,
                                             const char *remote);
-gboolean   flatpak_dir_create_remote_for_ref_file (FlatpakDir   *self,
-                                                   GKeyFile *keyfile,
+gboolean   flatpak_dir_create_remote_for_ref_file (FlatpakDir *self,
+                                                   GKeyFile   *keyfile,
                                                    const char *default_arch,
-                                                   char   **remote_name_out,
-                                                   char   **collection_id_out,
-                                                   char   **ref_out,
-                                                   GError **error);
-gboolean   flatpak_dir_create_suggested_remote_for_ref_file (FlatpakDir   *self,
-                                                             GBytes  *data,
-                                                             GError **error);
+                                                   char      **remote_name_out,
+                                                   char      **collection_id_out,
+                                                   char      **ref_out,
+                                                   GError    **error);
+gboolean   flatpak_dir_create_suggested_remote_for_ref_file (FlatpakDir *self,
+                                                             GBytes     *data,
+                                                             GError    **error);
 GKeyFile * flatpak_dir_parse_repofile (FlatpakDir   *self,
                                        const char   *remote_name,
                                        gboolean      from_ref,
@@ -632,11 +632,11 @@ GKeyFile * flatpak_dir_parse_repofile (FlatpakDir   *self,
                                        GCancellable *cancellable,
                                        GError      **error);
 
-char      *flatpak_dir_find_remote_by_uri (FlatpakDir   *self,
-                                           const char   *uri,
-                                           const char   *collection_id);
-gboolean   flatpak_dir_has_remote (FlatpakDir   *self,
-                                   const char   *remote_name);
+char      *flatpak_dir_find_remote_by_uri (FlatpakDir *self,
+                                           const char *uri,
+                                           const char *collection_id);
+gboolean   flatpak_dir_has_remote (FlatpakDir *self,
+                                   const char *remote_name);
 char     **flatpak_dir_list_remotes (FlatpakDir   *self,
                                      GCancellable *cancellable,
                                      GError      **error);
@@ -672,11 +672,11 @@ gboolean   flatpak_dir_get_remote_nodeps (FlatpakDir *self,
                                           const char *remote_name);
 gboolean   flatpak_dir_get_remote_disabled (FlatpakDir *self,
                                             const char *remote_name);
-gboolean   flatpak_dir_list_remote_refs (FlatpakDir   *self,
+gboolean   flatpak_dir_list_remote_refs (FlatpakDir         *self,
                                          FlatpakRemoteState *state,
-                                         GHashTable  **refs,
-                                         GCancellable *cancellable,
-                                         GError      **error);
+                                         GHashTable        **refs,
+                                         GCancellable       *cancellable,
+                                         GError            **error);
 GVariant * flatpak_dir_fetch_remote_commit (FlatpakDir   *self,
                                             const char   *remote_name,
                                             const char   *ref,
@@ -688,12 +688,12 @@ gboolean flatpak_dir_update_remote_configuration (FlatpakDir   *self,
                                                   const char   *remote,
                                                   GCancellable *cancellable,
                                                   GError      **error);
-gboolean flatpak_dir_update_remote_configuration_for_state (FlatpakDir    *self,
+gboolean flatpak_dir_update_remote_configuration_for_state (FlatpakDir         *self,
                                                             FlatpakRemoteState *remote_state,
-                                                            gboolean       dry_run,
-                                                            gboolean      *has_changed_out,
-                                                            GCancellable  *cancellable,
-                                                            GError       **error);
+                                                            gboolean            dry_run,
+                                                            gboolean           *has_changed_out,
+                                                            GCancellable       *cancellable,
+                                                            GError            **error);
 FlatpakRemoteState * flatpak_dir_get_remote_state (FlatpakDir   *self,
                                                    const char   *remote,
                                                    GCancellable *cancellable,
@@ -712,29 +712,29 @@ FlatpakRemoteState * flatpak_dir_get_remote_state_local_only (FlatpakDir   *self
                                                               const char   *remote,
                                                               GCancellable *cancellable,
                                                               GError      **error);
-GPtrArray * flatpak_dir_find_remote_related_for_metadata (FlatpakDir *self,
+GPtrArray * flatpak_dir_find_remote_related_for_metadata (FlatpakDir         *self,
                                                           FlatpakRemoteState *state,
-                                                          const char *ref,
-                                                          GKeyFile *metakey,
-                                                          GCancellable *cancellable,
-                                                          GError **error);
-GPtrArray * flatpak_dir_find_remote_related (FlatpakDir *dir,
+                                                          const char         *ref,
+                                                          GKeyFile           *metakey,
+                                                          GCancellable       *cancellable,
+                                                          GError            **error);
+GPtrArray * flatpak_dir_find_remote_related (FlatpakDir         *dir,
                                              FlatpakRemoteState *state,
-                                             const char *ref,
-                                             GCancellable *cancellable,
-                                             GError **error);
-GPtrArray * flatpak_dir_find_local_related_for_metadata (FlatpakDir *self,
-                                                         const char *ref,
-                                                         const char *remote_name,
-                                                         GKeyFile *metakey,
+                                             const char         *ref,
+                                             GCancellable       *cancellable,
+                                             GError            **error);
+GPtrArray * flatpak_dir_find_local_related_for_metadata (FlatpakDir   *self,
+                                                         const char   *ref,
+                                                         const char   *remote_name,
+                                                         GKeyFile     *metakey,
                                                          GCancellable *cancellable,
-                                                         GError **error);
-GPtrArray * flatpak_dir_find_local_related (FlatpakDir *self,
-                                            const char *remote_name,
-                                            const char *ref,
-                                            gboolean deployed,
+                                                         GError      **error);
+GPtrArray * flatpak_dir_find_local_related (FlatpakDir   *self,
+                                            const char   *remote_name,
+                                            const char   *ref,
+                                            gboolean      deployed,
                                             GCancellable *cancellable,
-                                            GError **error);
+                                            GError      **error);
 gboolean flatpak_dir_find_latest_rev (FlatpakDir               *self,
                                       FlatpakRemoteState       *state,
                                       const char               *ref,
@@ -744,21 +744,22 @@ gboolean flatpak_dir_find_latest_rev (FlatpakDir               *self,
                                       GCancellable             *cancellable,
                                       GError                  **error);
 
-typedef struct {
+typedef struct
+{
   /* in */
   char *remote;
   char *ref;
   char *opt_commit;
 
   /* out */
-  char *resolved_commit;
+  char   *resolved_commit;
   GBytes *resolved_metadata;
 } FlatpakDirResolve;
 
-FlatpakDirResolve *flatpak_dir_resolve_new      (const char         *remote,
-                                                 const char         *ref,
-                                                 const char         *opt_commit);
-void               flatpak_dir_resolve_free     (FlatpakDirResolve  *resolve);
+FlatpakDirResolve *flatpak_dir_resolve_new (const char *remote,
+                                            const char *ref,
+                                            const char *opt_commit);
+void               flatpak_dir_resolve_free (FlatpakDirResolve *resolve);
 gboolean           flatpak_dir_resolve_p2p_refs (FlatpakDir         *self,
                                                  FlatpakDirResolve **resolves,
                                                  GCancellable       *cancellable,
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 59ff8e7a..c311f74e 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -50,7 +50,7 @@
 
 #define NO_SYSTEM_HELPER ((FlatpakSystemHelper *) (gpointer) 1)
 
-#define SUMMARY_CACHE_TIMEOUT_SEC 5*60
+#define SUMMARY_CACHE_TIMEOUT_SEC 5 *60
 
 #define SYSCONF_INSTALLATIONS_DIR "installations.d"
 #define SYSCONF_INSTALLATIONS_FILE_EXT ".conf"
@@ -64,11 +64,11 @@ static FlatpakOciRegistry *flatpak_dir_create_system_child_oci_registry (Flatpak
                                                                          GLnxLockFile *file_lock,
                                                                          GError      **error);
 
-static OstreeRepo * flatpak_dir_create_child_repo        (FlatpakDir   *self,
-                                                          GFile        *cache_dir,
-                                                          GLnxLockFile *file_lock,
-                                                          const char   *optional_commit,
-                                                          GError      **error);
+static OstreeRepo * flatpak_dir_create_child_repo (FlatpakDir   *self,
+                                                   GFile        *cache_dir,
+                                                   GLnxLockFile *file_lock,
+                                                   const char   *optional_commit,
+                                                   GError      **error);
 static OstreeRepo * flatpak_dir_create_system_child_repo (FlatpakDir   *self,
                                                           GLnxLockFile *file_lock,
                                                           const char   *optional_checksum,
@@ -76,7 +76,7 @@ static OstreeRepo * flatpak_dir_create_system_child_repo (FlatpakDir   *self,
 
 static gboolean flatpak_dir_mirror_oci (FlatpakDir          *self,
                                         FlatpakOciRegistry  *dst_registry,
-                                        FlatpakRemoteState *state,
+                                        FlatpakRemoteState  *state,
                                         const char          *ref,
                                         const char          *skip_if_current_is,
                                         OstreeAsyncProgress *progress,
@@ -94,17 +94,17 @@ static GVariant * flatpak_create_deploy_data_from_old (GFile        *deploy_dir,
                                                        GCancellable *cancellable,
                                                        GError      **error);
 
-static gboolean _flatpak_dir_fetch_remote_state_metadata_branch (FlatpakDir    *self,
+static gboolean _flatpak_dir_fetch_remote_state_metadata_branch (FlatpakDir         *self,
                                                                  FlatpakRemoteState *state,
-                                                                 GCancellable  *cancellable,
-                                                                 GError       **error);
+                                                                 GCancellable       *cancellable,
+                                                                 GError            **error);
 
 typedef struct
 {
   GBytes *bytes;
   GBytes *bytes_sig;
-  char *remote;
-  char *url;
+  char   *remote;
+  char   *url;
   guint64 time;
 } CachedSummary;
 
@@ -178,13 +178,13 @@ get_config_dir_location (void)
       gsize setup_value = 0;
       const char *config_dir = g_getenv ("FLATPAK_CONFIG_DIR");
       if (config_dir != NULL)
-        setup_value = (gsize)config_dir;
+        setup_value = (gsize) config_dir;
       else
-        setup_value = (gsize)FLATPAK_CONFIGDIR;
+        setup_value = (gsize) FLATPAK_CONFIGDIR;
       g_once_init_leave (&path, setup_value);
-     }
+    }
 
-  return (const char *)path;
+  return (const char *) path;
 }
 
 static FlatpakRemoteState *
@@ -282,7 +282,7 @@ flatpak_remote_state_match_subrefs (FlatpakRemoteState *self,
     {
       const char *empty[] = { NULL };
       g_debug ("flatpak_remote_state_match_subrefs with no summary");
-      return g_strdupv ((char **)empty);
+      return g_strdupv ((char **) empty);
     }
 
   return flatpak_summary_match_subrefs (self->summary, self->collection_id, ref);
@@ -376,7 +376,7 @@ flatpak_remote_state_lookup_cache (FlatpakRemoteState *self,
 GVariant *
 flatpak_remote_state_lookup_sparse_cache (FlatpakRemoteState *self,
                                           const char         *ref,
-                                          GError             **error)
+                                          GError            **error)
 {
   g_autoptr(GVariant) cache = NULL;
   int pos;
@@ -401,7 +401,7 @@ static gboolean
 flatpak_remote_state_save_summary (FlatpakRemoteState *self,
                                    GFile              *dir,
                                    GCancellable       *cancellable,
-                                   GError             **error)
+                                   GError            **error)
 {
   g_autoptr(GFile) summary_file = g_file_get_child (dir, "summary");
   g_autoptr(GBytes) summary_bytes = NULL;
@@ -438,6 +438,7 @@ dir_extra_data_new (const char           *id,
                     FlatpakDirStorageType type)
 {
   DirExtraData *dir_extra_data = g_new0 (DirExtraData, 1);
+
   dir_extra_data->id = g_strdup (id);
   dir_extra_data->display_name = g_strdup (display_name);
   dir_extra_data->priority = priority;
@@ -470,10 +471,11 @@ variant_new_ay_bytes (GBytes *bytes)
 {
   gsize size;
   gconstpointer data;
+
   data = g_bytes_get_data (bytes, &size);
   g_bytes_ref (bytes);
   return g_variant_ref_sink (g_variant_new_from_data (G_VARIANT_TYPE ("ay"), data, size,
-                                                      TRUE, (GDestroyNotify)g_bytes_unref, bytes));
+                                                      TRUE, (GDestroyNotify) g_bytes_unref, bytes));
 }
 
 static void
@@ -512,7 +514,7 @@ flatpak_deploy_get_dir (FlatpakDeploy *deploy)
 }
 
 GVariant *
-flatpak_load_deploy_data (GFile *deploy_dir,
+flatpak_load_deploy_data (GFile        *deploy_dir,
                           GCancellable *cancellable,
                           GError      **error)
 {
@@ -542,8 +544,8 @@ flatpak_load_deploy_data (GFile *deploy_dir,
 
 GVariant *
 flatpak_deploy_get_deploy_data (FlatpakDeploy *deploy,
-                                GCancellable *cancellable,
-                                GError      **error)
+                                GCancellable  *cancellable,
+                                GError       **error)
 {
   return flatpak_load_deploy_data (deploy->dir,
                                    cancellable,
@@ -604,13 +606,13 @@ flatpak_get_system_default_base_dir_location (void)
       gsize setup_value = 0;
       const char *system_dir = g_getenv ("FLATPAK_SYSTEM_DIR");
       if (system_dir != NULL)
-        setup_value = (gsize)system_dir;
+        setup_value = (gsize) system_dir;
       else
-        setup_value = (gsize)FLATPAK_SYSTEMDIR;
+        setup_value = (gsize) FLATPAK_SYSTEMDIR;
       g_once_init_leave (&path, setup_value);
-     }
+    }
 
-  return g_file_new_for_path ((char *)path);
+  return g_file_new_for_path ((char *) path);
 }
 
 static FlatpakDirStorageType
@@ -666,7 +668,7 @@ append_new_system_location (GPtrArray            *locations,
 
   extra_data = dir_extra_data_new (id, display_name, priority, storage_type);
   g_object_set_data_full (G_OBJECT (location), "extra-data", extra_data,
-                          (GDestroyNotify)dir_extra_data_free);
+                          (GDestroyNotify) dir_extra_data_free);
 
   g_ptr_array_add (locations, location);
 }
@@ -749,15 +751,15 @@ append_locations_from_config_file (GPtrArray    *locations,
 
   ret = TRUE;
 
- out:
+out:
   return ret;
 }
 
 static gint
 system_locations_compare_func (gconstpointer location_a, gconstpointer location_b)
 {
-  const GFile *location_object_a = *(const GFile **)location_a;
-  const GFile *location_object_b = *(const GFile **)location_b;
+  const GFile *location_object_a = *(const GFile **) location_a;
+  const GFile *location_object_b = *(const GFile **) location_b;
   DirExtraData *extra_data_a = NULL;
   DirExtraData *extra_data_b = NULL;
   gint prio_a = 0;
@@ -836,7 +838,7 @@ system_locations_from_configuration (GCancellable *cancellable,
         }
     }
 
- out:
+out:
   return g_steal_pointer (&locations);
 }
 
@@ -879,7 +881,7 @@ flatpak_get_system_base_dir_locations (GCancellable *cancellable,
       gsize setup_value = 0;
       setup_value = (gsize) get_system_locations (cancellable, error);
       g_once_init_leave (&array, setup_value);
-     }
+    }
 
   return (GPtrArray *) array;
 }
@@ -905,7 +907,7 @@ flatpak_get_user_base_dir_location (void)
       g_once_init_leave (&file, setup_value);
     }
 
-  return g_object_ref ((GFile *)file);
+  return g_object_ref ((GFile *) file);
 }
 
 /* This is a cache directory similar to ~/.cache/flatpak/system-cache,
@@ -1460,8 +1462,8 @@ flatpak_dir_get_deploy_dir (FlatpakDir *self,
 }
 
 char *
-flatpak_dir_get_deploy_subdir (FlatpakDir *self,
-                               const char *checksum,
+flatpak_dir_get_deploy_subdir (FlatpakDir          *self,
+                               const char          *checksum,
                                const char * const * subpaths)
 {
   if (subpaths == NULL || *subpaths == NULL)
@@ -1858,11 +1860,12 @@ flatpak_dir_ensure_path (FlatpakDir   *self,
 /* Warning: This is not threadsafe, don't use in libflatpak */
 gboolean
 flatpak_dir_recreate_repo (FlatpakDir   *self,
-                            GCancellable *cancellable,
-                            GError      **error)
+                           GCancellable *cancellable,
+                           GError      **error)
 {
   gboolean res;
   OstreeRepo *old_repo = g_steal_pointer (&self->repo);
+
   res = flatpak_dir_ensure_repo (self, cancellable, error);
   g_clear_object (&old_repo);
   return res;
@@ -2056,16 +2059,16 @@ flatpak_dir_set_config (FlatpakDir *self,
       g_assert (system_helper != NULL);
 
       if (value == NULL)
-	{
-	  flags |= FLATPAK_HELPER_CONFIGURE_FLAGS_UNSET;
-	  value = "";
-	}
+        {
+          flags |= FLATPAK_HELPER_CONFIGURE_FLAGS_UNSET;
+          value = "";
+        }
 
       g_debug ("Calling system helper: Configure");
       if (!flatpak_system_helper_call_configure_sync (system_helper,
-						      flags, key, value,
-						      installation ? installation : "",
-						      NULL, error))
+                                                      flags, key, value,
+                                                      installation ? installation : "",
+                                                      NULL, error))
         return FALSE;
 
       return TRUE;
@@ -2122,12 +2125,12 @@ flatpak_dir_remove_appstream (FlatpakDir   *self,
 }
 
 gboolean
-flatpak_dir_deploy_appstream (FlatpakDir          *self,
-                              const char          *remote,
-                              const char          *arch,
-                              gboolean            *out_changed,
-                              GCancellable        *cancellable,
-                              GError             **error)
+flatpak_dir_deploy_appstream (FlatpakDir   *self,
+                              const char   *remote,
+                              const char   *arch,
+                              gboolean     *out_changed,
+                              GCancellable *cancellable,
+                              GError      **error)
 {
   g_autoptr(GFile) appstream_dir = NULL;
   g_autoptr(GFile) remote_dir = NULL;
@@ -2325,11 +2328,10 @@ flatpak_dir_deploy_appstream (FlatpakDir          *self,
   return TRUE;
 }
 
-static gboolean
-repo_get_remote_collection_id (OstreeRepo  *repo,
-                               const char  *remote_name,
-                               char       **collection_id_out,
-                               GError     **error);
+static gboolean repo_get_remote_collection_id (OstreeRepo *repo,
+                                               const char *remote_name,
+                                               char      **collection_id_out,
+                                               GError    **error);
 
 static void
 async_result_cb (GObject      *obj,
@@ -2337,6 +2339,7 @@ async_result_cb (GObject      *obj,
                  gpointer      user_data)
 {
   GAsyncResult **result_out = user_data;
+
   *result_out = g_object_ref (result);
 }
 
@@ -2382,8 +2385,8 @@ flatpak_dir_find_latest_rev (FlatpakDir               *self,
 
       ostree_repo_find_remotes_async (self->repo, (const OstreeCollectionRef * const *) collection_refs_to_fetch,
                                       find_options,
-                                      NULL  /* default finders */,
-                                      NULL  /* no progress reporting */,
+                                      NULL /* default finders */,
+                                      NULL /* no progress reporting */,
                                       cancellable, async_result_cb, &find_result);
 
       while (find_result == NULL)
@@ -2429,9 +2432,9 @@ flatpak_dir_find_latest_rev (FlatpakDir               *self,
 }
 
 FlatpakDirResolve *
-flatpak_dir_resolve_new (const char         *remote,
-                         const char         *ref,
-                         const char         *opt_commit)
+flatpak_dir_resolve_new (const char *remote,
+                         const char *ref,
+                         const char *opt_commit)
 {
   FlatpakDirResolve *resolve = g_new0 (FlatpakDirResolve, 1);
 
@@ -2476,10 +2479,11 @@ remove_ref_from_p2p_results (OstreeRepoFinderResult **results, OstreeCollectionR
     g_hash_table_remove (results[i]->ref_to_checksum, cr);
 }
 
-typedef struct {
-  FlatpakDirResolve *resolve; /* not owned */
+typedef struct
+{
+  FlatpakDirResolve  *resolve; /* not owned */
   OstreeCollectionRef collection_ref; /* owns the collection_id member only */
-  char *local_commit;
+  char               *local_commit;
 } FlatpakDirResolveData;
 
 static void
@@ -2494,11 +2498,11 @@ flatpak_dir_resolve_data_free (FlatpakDirResolveData *data)
 }
 
 static gboolean
-flatpak_dir_do_resolve_p2p_refs (FlatpakDir               *self,
-                                 FlatpakDirResolveData   **datas,
-                                 gboolean                  with_commit_ids,
-                                 GCancellable             *cancellable,
-                                 GError                  **error)
+flatpak_dir_do_resolve_p2p_refs (FlatpakDir             *self,
+                                 FlatpakDirResolveData **datas,
+                                 gboolean                with_commit_ids,
+                                 GCancellable           *cancellable,
+                                 GError                **error)
 {
   g_autoptr(GPtrArray) collection_refs_to_fetch = g_ptr_array_new ();
   g_autoptr(GPtrArray) commit_ids_to_fetch = NULL;
@@ -2540,7 +2544,7 @@ flatpak_dir_do_resolve_p2p_refs (FlatpakDir               *self,
   g_variant_builder_init (&find_builder, G_VARIANT_TYPE ("a{sv}"));
   if (commit_ids_to_fetch)
     g_variant_builder_add (&find_builder, "{s@v}", "override-commit-ids",
-                           g_variant_new_variant (g_variant_new_strv ((const char * const*)commit_ids_to_fetch->pdata,
+                           g_variant_new_variant (g_variant_new_strv ((const char * const *) commit_ids_to_fetch->pdata,
                                                                       commit_ids_to_fetch->len)));
   find_options = g_variant_ref_sink (g_variant_builder_end (&find_builder));
 
@@ -2561,8 +2565,8 @@ flatpak_dir_do_resolve_p2p_refs (FlatpakDir               *self,
   ostree_repo_find_remotes_async (child_repo,
                                   (const OstreeCollectionRef * const *) collection_refs_to_fetch->pdata,
                                   find_options,
-                                  NULL  /* default finders */,
-                                  NULL  /* no progress reporting */,
+                                  NULL /* default finders */,
+                                  NULL /* no progress reporting */,
                                   cancellable, async_result_cb, &find_result);
 
   while (find_result == NULL)
@@ -2619,7 +2623,7 @@ flatpak_dir_do_resolve_p2p_refs (FlatpakDir               *self,
   if (transaction == NULL)
     return FALSE;
 
-  ostree_repo_pull_from_remotes_async (child_repo, (const OstreeRepoFinderResult * const *)results,
+  ostree_repo_pull_from_remotes_async (child_repo, (const OstreeRepoFinderResult * const *) results,
                                        pull_options, NULL,
                                        cancellable, async_result_cb,
                                        &pull_result);
@@ -2661,13 +2665,13 @@ flatpak_dir_do_resolve_p2p_refs (FlatpakDir               *self,
 }
 
 gboolean
-flatpak_dir_resolve_p2p_refs (FlatpakDir               *self,
-                              FlatpakDirResolve       **resolves,
-                              GCancellable             *cancellable,
-                              GError                  **error)
+flatpak_dir_resolve_p2p_refs (FlatpakDir         *self,
+                              FlatpakDirResolve **resolves,
+                              GCancellable       *cancellable,
+                              GError            **error)
 {
-  g_autoptr(GPtrArray) latest_resolves = g_ptr_array_new_with_free_func ((GDestroyNotify)flatpak_dir_resolve_data_free);
-  g_autoptr(GPtrArray) specific_resolves = g_ptr_array_new_with_free_func ((GDestroyNotify)flatpak_dir_resolve_data_free);
+  g_autoptr(GPtrArray) latest_resolves = g_ptr_array_new_with_free_func ((GDestroyNotify) flatpak_dir_resolve_data_free);
+  g_autoptr(GPtrArray) specific_resolves = g_ptr_array_new_with_free_func ((GDestroyNotify) flatpak_dir_resolve_data_free);
   int i;
 
   for (i = 0; resolves[i] != NULL; i++)
@@ -2700,7 +2704,7 @@ flatpak_dir_resolve_p2p_refs (FlatpakDir               *self,
   if (specific_resolves->len > 0)
     {
       g_ptr_array_add (specific_resolves, NULL);
-      if (!flatpak_dir_do_resolve_p2p_refs (self, (FlatpakDirResolveData **)specific_resolves->pdata, TRUE,
+      if (!flatpak_dir_do_resolve_p2p_refs (self, (FlatpakDirResolveData **) specific_resolves->pdata, TRUE,
                                             cancellable, error))
         return FALSE;
     }
@@ -2708,7 +2712,7 @@ flatpak_dir_resolve_p2p_refs (FlatpakDir               *self,
   if (latest_resolves->len > 0)
     {
       g_ptr_array_add (latest_resolves, NULL);
-      if (!flatpak_dir_do_resolve_p2p_refs (self, (FlatpakDirResolveData **)latest_resolves->pdata, FALSE,
+      if (!flatpak_dir_do_resolve_p2p_refs (self, (FlatpakDirResolveData **) latest_resolves->pdata, FALSE,
                                             cancellable, error))
         return FALSE;
     }
@@ -2717,10 +2721,10 @@ flatpak_dir_resolve_p2p_refs (FlatpakDir               *self,
 }
 
 static gboolean
-child_repo_ensure_summary (OstreeRepo *child_repo,
+child_repo_ensure_summary (OstreeRepo         *child_repo,
                            FlatpakRemoteState *state,
-                           GCancellable        *cancellable,
-                           GError             **error)
+                           GCancellable       *cancellable,
+                           GError            **error)
 {
   if (state->collection_id != NULL)
     {
@@ -2758,6 +2762,7 @@ flatpak_dir_update_appstream (FlatpakDir          *self,
   const char *used_branch = NULL;
   g_autofree char *remote_and_branch = NULL;
   g_autofree char *new_checksum = NULL;
+
   g_autoptr(GError) first_error = NULL;
   g_autoptr(GError) second_error = NULL;
   g_autoptr(FlatpakRemoteState) state = NULL;
@@ -2968,10 +2973,10 @@ default_progress_changed (OstreeAsyncProgress *progress,
  * %NULL. Return %TRUE if the ID was fetched successfully, or if it was unset or
  * empty. */
 static gboolean
-repo_get_remote_collection_id (OstreeRepo  *repo,
-                               const char  *remote_name,
-                               char       **collection_id_out,
-                               GError     **error)
+repo_get_remote_collection_id (OstreeRepo *repo,
+                               const char *remote_name,
+                               char      **collection_id_out,
+                               GError    **error)
 {
   if (collection_id_out != NULL)
     {
@@ -3002,7 +3007,7 @@ get_common_pull_options (GVariantBuilder     *builder,
   if (dirs_to_pull)
     {
       g_variant_builder_add (builder, "{s@v}", "subdirs",
-                             g_variant_new_variant (g_variant_new_strv ((const char * const *)dirs_to_pull, -1)));
+                             g_variant_new_variant (g_variant_new_strv ((const char * const *) dirs_to_pull, -1)));
       force_disable_deltas = TRUE;
     }
 
@@ -3038,21 +3043,22 @@ get_common_pull_options (GVariantBuilder     *builder,
 }
 
 static gboolean
-repo_pull (OstreeRepo          *self,
-           const char          *remote_name,
-           const char         **dirs_to_pull,
-           const char          *ref_to_fetch,
-           const char          *rev_to_fetch,
+repo_pull (OstreeRepo                           *self,
+           const char                           *remote_name,
+           const char                          **dirs_to_pull,
+           const char                           *ref_to_fetch,
+           const char                           *rev_to_fetch,
            const OstreeRepoFinderResult * const *results_to_fetch,
-           FlatpakPullFlags     flatpak_flags,
-           OstreeRepoPullFlags  flags,
-           OstreeAsyncProgress *progress,
-           GCancellable        *cancellable,
-           GError             **error)
+           FlatpakPullFlags                      flatpak_flags,
+           OstreeRepoPullFlags                   flags,
+           OstreeAsyncProgress                  *progress,
+           GCancellable                         *cancellable,
+           GError                              **error)
 {
   gboolean force_disable_deltas = (flatpak_flags & FLATPAK_PULL_FLAGS_NO_STATIC_DELTAS) != 0;
   g_autofree char *remote_and_branch = NULL;
   g_autofree char *current_checksum = NULL;
+
   g_autoptr(GVariant) old_commit = NULL;
   g_autoptr(GVariant) new_commit = NULL;
   const char *revs_to_fetch[2];
@@ -3131,7 +3137,7 @@ repo_pull (OstreeRepo          *self,
         {
           ostree_repo_find_remotes_async (self, (const OstreeCollectionRef * const *) collection_refs_to_fetch,
                                           find_options,
-                                          NULL  /* default finders */, progress, cancellable,
+                                          NULL /* default finders */, progress, cancellable,
                                           async_result_cb, &find_result);
 
           while (find_result == NULL)
@@ -3233,13 +3239,14 @@ ensure_soup_session (FlatpakDir *self)
     }
 }
 
-typedef struct {
+typedef struct
+{
   OstreeAsyncProgress *progress;
-  guint64 previous_dl;
+  guint64              previous_dl;
 } ExtraDataProgress;
 
 static void
-extra_data_progress_report (guint64 downloaded_bytes,
+extra_data_progress_report (guint64  downloaded_bytes,
                             gpointer user_data)
 {
   ExtraDataProgress *extra_progress = user_data;
@@ -3251,16 +3258,16 @@ extra_data_progress_report (guint64 downloaded_bytes,
 }
 
 static gboolean
-flatpak_dir_setup_extra_data (FlatpakDir           *self,
-                              OstreeRepo           *repo,
-                              const char           *repository,
-                              const char           *ref,
-                              const char           *rev,
+flatpak_dir_setup_extra_data (FlatpakDir                           *self,
+                              OstreeRepo                           *repo,
+                              const char                           *repository,
+                              const char                           *ref,
+                              const char                           *rev,
                               const OstreeRepoFinderResult * const *results,
-                              FlatpakPullFlags      flatpak_flags,
-                              OstreeAsyncProgress  *progress,
-                              GCancellable         *cancellable,
-                              GError              **error)
+                              FlatpakPullFlags                      flatpak_flags,
+                              OstreeAsyncProgress                  *progress,
+                              GCancellable                         *cancellable,
+                              GError                              **error)
 {
   g_autoptr(GVariant) extra_data_sources = NULL;
   int i;
@@ -3520,7 +3527,7 @@ flatpak_dir_pull_extra_data (FlatpakDir          *self,
 
 static char *
 lookup_oci_registry_uri_from_summary (GVariant *summary,
-                                      GError **error)
+                                      GError  **error)
 {
   g_autoptr(GVariant) extensions = g_variant_get_child_value (summary, 1);
   g_autofree char *registry_uri = NULL;
@@ -3598,7 +3605,7 @@ oci_pull_progress_cb (guint64 total_size, guint64 pulled_size,
 static gboolean
 flatpak_dir_mirror_oci (FlatpakDir          *self,
                         FlatpakOciRegistry  *dst_registry,
-                        FlatpakRemoteState *state,
+                        FlatpakRemoteState  *state,
                         const char          *ref,
                         const char          *skip_if_current_is,
                         OstreeAsyncProgress *progress,
@@ -3788,22 +3795,23 @@ flatpak_dir_pull_oci (FlatpakDir          *self,
 }
 
 gboolean
-flatpak_dir_pull (FlatpakDir          *self,
-                  FlatpakRemoteState  *state,
-                  const char          *ref,
-                  const char          *opt_rev,
+flatpak_dir_pull (FlatpakDir                           *self,
+                  FlatpakRemoteState                   *state,
+                  const char                           *ref,
+                  const char                           *opt_rev,
                   const OstreeRepoFinderResult * const *opt_results,
-                  const char         **subpaths,
-                  OstreeRepo          *repo,
-                  FlatpakPullFlags     flatpak_flags,
-                  OstreeRepoPullFlags  flags,
-                  OstreeAsyncProgress *progress,
-                  GCancellable        *cancellable,
-                  GError             **error)
+                  const char                          **subpaths,
+                  OstreeRepo                           *repo,
+                  FlatpakPullFlags                      flatpak_flags,
+                  OstreeRepoPullFlags                   flags,
+                  OstreeAsyncProgress                  *progress,
+                  GCancellable                         *cancellable,
+                  GError                              **error)
 {
   gboolean ret = FALSE;
   g_autofree char *rev = NULL;
   g_autofree char *url = NULL;
+
   g_auto(GLnxConsoleRef) console = { 0, };
   g_autoptr(OstreeAsyncProgress) console_progress = NULL;
   g_autoptr(GPtrArray) subdirs_arg = NULL;
@@ -3900,7 +3908,7 @@ flatpak_dir_pull (FlatpakDir          *self,
 
           ostree_repo_find_remotes_async (self->repo, (const OstreeCollectionRef * const *) collection_refs_to_fetch,
                                           find_options,
-                                          NULL  /* default finders */, progress, cancellable,
+                                          NULL /* default finders */, progress, cancellable,
                                           async_result_cb, &find_result);
 
           while (find_result == NULL)
@@ -3967,7 +3975,7 @@ flatpak_dir_pull (FlatpakDir          *self,
     goto out;
 
   if (!repo_pull (repo, state->remote_name,
-                  subdirs_arg ? (const char **)subdirs_arg->pdata : NULL,
+                  subdirs_arg ? (const char **) subdirs_arg->pdata : NULL,
                   ref, rev, results, flatpak_flags, flags,
                   progress,
                   cancellable, error))
@@ -4014,8 +4022,9 @@ repo_pull_local_untrusted (FlatpakDir          *self,
                            GError             **error)
 {
   /* The latter flag was introduced in https://github.com/ostreedev/ostree/pull/926 */
-  const OstreeRepoPullFlags flags = OSTREE_REPO_PULL_FLAGS_UNTRUSTED |OSTREE_REPO_PULL_FLAGS_BAREUSERONLY_FILES;
+  const OstreeRepoPullFlags flags = OSTREE_REPO_PULL_FLAGS_UNTRUSTED | OSTREE_REPO_PULL_FLAGS_BAREUSERONLY_FILES;
   GVariantBuilder builder;
+
   g_auto(GVariantBuilder) refs_builder = FLATPAK_VARIANT_BUILDER_INITIALIZER;
   g_auto(GLnxConsoleRef) console = { 0, };
   g_autoptr(OstreeAsyncProgress) console_progress = NULL;
@@ -4078,7 +4087,7 @@ repo_pull_local_untrusted (FlatpakDir          *self,
   if (dirs_to_pull)
     {
       g_variant_builder_add (&builder, "{s@v}", "subdirs",
-                             g_variant_new_variant (g_variant_new_strv ((const char * const *)dirs_to_pull, -1)));
+                             g_variant_new_variant (g_variant_new_strv ((const char * const *) dirs_to_pull, -1)));
       g_variant_builder_add (&builder, "{s@v}", "disable-static-deltas",
                              g_variant_new_variant (g_variant_new_boolean (TRUE)));
     }
@@ -4256,10 +4265,10 @@ flatpak_dir_pull_untrusted_local (FlatpakDir          *self,
         }
 
       if (collection_id != NULL &&
-          !g_strv_contains ((const char *const *) commit_refs, ref))
+          !g_strv_contains ((const char * const *) commit_refs, ref))
         {
           return flatpak_fail (error, "commit has no requested ref ‘%s’ "
-                               "in ref binding metadata",
+                                      "in ref binding metadata",
                                ref);
         }
 
@@ -4311,7 +4320,7 @@ flatpak_dir_pull_untrusted_local (FlatpakDir          *self,
   /* Past this we must use goto out, so we abort the transaction on error */
 
   if (!repo_pull_local_untrusted (self, self->repo, remote_name, url,
-                                  subdirs_arg ? (const char **)subdirs_arg->pdata : NULL,
+                                  subdirs_arg ? (const char **) subdirs_arg->pdata : NULL,
                                   ref, checksum, progress,
                                   cancellable, error))
     {
@@ -4657,6 +4666,7 @@ flatpak_dir_read_latest_commit (FlatpakDir   *self,
 {
   g_autofree char *remote_and_ref = NULL;
   g_autofree char *res = NULL;
+
   g_autoptr(GVariant) commit_data = NULL;
 
   /* There may be several remotes with the same branch (if we for
@@ -4717,7 +4727,7 @@ flatpak_dir_read_latest (FlatpakDir   *self,
       g_variant_lookup (commit_metadata, "xa.alt-id", "s", &alt_id);
 
       *out_alt_id = g_steal_pointer (&alt_id);
-     }
+    }
 
   return res;
 }
@@ -5001,16 +5011,17 @@ typedef enum {
 } ExportedIniFileType;
 
 static gboolean
-export_ini_file (int           parent_fd,
-                 const char   *name,
+export_ini_file (int                 parent_fd,
+                 const char         *name,
                  ExportedIniFileType ini_type,
-                 struct stat  *stat_buf,
-                 char        **target,
-                 GCancellable *cancellable,
-                 GError      **error)
+                 struct stat        *stat_buf,
+                 char              **target,
+                 GCancellable       *cancellable,
+                 GError            **error)
 {
   glnx_autofd int desktop_fd = -1;
   g_autofree char *tmpfile_name = g_strdup_printf ("export-ini-XXXXXX");
+
   g_autoptr(GOutputStream) out_stream = NULL;
   g_autofree gchar *data = NULL;
   gsize data_len;
@@ -5047,13 +5058,14 @@ export_ini_file (int           parent_fd,
 static inline void
 xml_autoptr_cleanup_generic_free (void *p)
 {
-  void **pp = (void**)p;
+  void **pp = (void **) p;
+
   if (*pp)
     xmlFree (*pp);
 }
 
 
-#define xml_autofree _GLIB_CLEANUP(xml_autoptr_cleanup_generic_free)
+#define xml_autofree _GLIB_CLEANUP (xml_autoptr_cleanup_generic_free)
 
 /* This verifies the basic layout of the files, then it removes
  * any magic matches, and makes all glob matches have a very low
@@ -5072,7 +5084,7 @@ rewrite_mime_xml (xmlDoc *doc)
       if (top_node->type != XML_ELEMENT_NODE)
         continue;
 
-      if (strcmp ((char *)top_node->name, "mime-info") != 0)
+      if (strcmp ((char *) top_node->name, "mime-info") != 0)
         return FALSE;
 
       for (mime_node = top_node->children; mime_node; mime_node = mime_node->next)
@@ -5084,10 +5096,10 @@ rewrite_mime_xml (xmlDoc *doc)
           if (mime_node->type != XML_ELEMENT_NODE)
             continue;
 
-          if (strcmp ((char *)mime_node->name, "mime-type") != 0)
+          if (strcmp ((char *) mime_node->name, "mime-type") != 0)
             return FALSE;
 
-          mimetype = xmlGetProp (mime_node, (xmlChar *)"type");
+          mimetype = xmlGetProp (mime_node, (xmlChar *) "type");
           for (sub_node = mime_node->children; sub_node; sub_node = next_sub_node)
             {
               next_sub_node = sub_node->next;
@@ -5095,17 +5107,17 @@ rewrite_mime_xml (xmlDoc *doc)
               if (sub_node->type != XML_ELEMENT_NODE)
                 continue;
 
-              if (strcmp ((char *)sub_node->name, "magic") == 0)
+              if (strcmp ((char *) sub_node->name, "magic") == 0)
                 {
                   g_warning ("Removing magic mime rule from exports");
                   xmlUnlinkNode (sub_node);
-                  xmlFreeNode(sub_node);
+                  xmlFreeNode (sub_node);
                 }
-              else if (strcmp ((char *)sub_node->name, "glob") == 0)
+              else if (strcmp ((char *) sub_node->name, "glob") == 0)
                 {
                   xmlSetProp (sub_node,
-                              (const xmlChar *)"weight",
-                              (const xmlChar *)"5");
+                              (const xmlChar *) "weight",
+                              (const xmlChar *) "5");
                 }
             }
         }
@@ -5124,6 +5136,7 @@ export_mime_file (int           parent_fd,
 {
   glnx_autofd int desktop_fd = -1;
   g_autofree char *tmpfile_name = g_strdup_printf ("export-mime-XXXXXX");
+
   g_autoptr(GOutputStream) out_stream = NULL;
   g_autofree gchar *data = NULL;
   gsize data_len;
@@ -5194,6 +5207,7 @@ export_desktop_file (const char   *app,
   gboolean ret = FALSE;
   glnx_autofd int desktop_fd = -1;
   g_autofree char *tmpfile_name = g_strdup_printf ("export-desktop-XXXXXX");
+
   g_autoptr(GOutputStream) out_stream = NULL;
   g_autofree gchar *data = NULL;
   gsize data_len;
@@ -5508,6 +5522,7 @@ flatpak_rewrite_export_dir (const char   *app,
                             GError      **error)
 {
   gboolean ret = FALSE;
+
   g_autoptr(GFile) parent = g_file_get_parent (source);
   glnx_autofd int parentfd = -1;
   g_autofree char *name = g_file_get_basename (source);
@@ -5652,12 +5667,12 @@ flatpak_export_dir (GFile        *source,
   };
   int i;
 
-  for (i = 0; i < G_N_ELEMENTS(exported_subdirs); i = i + 2)
+  for (i = 0; i < G_N_ELEMENTS (exported_subdirs); i = i + 2)
     {
       /* The fds are closed by this call */
       g_autoptr(GFile) sub_source = g_file_resolve_relative_path (source, exported_subdirs[i]);
       g_autoptr(GFile) sub_destination = g_file_resolve_relative_path (destination, exported_subdirs[i]);
-      g_autofree char *sub_symlink_prefix = g_build_filename (exported_subdirs[i+1], symlink_prefix, exported_subdirs[i], NULL);
+      g_autofree char *sub_symlink_prefix = g_build_filename (exported_subdirs[i + 1], symlink_prefix, exported_subdirs[i], NULL);
 
       if (!g_file_query_exists (sub_source, cancellable))
         continue;
@@ -5725,12 +5740,12 @@ out:
 }
 
 static gboolean
-extract_extra_data (FlatpakDir          *self,
-                    const char          *checksum,
-                    GFile               *extradir,
-                    gboolean            *created_extra_data,
-                    GCancellable        *cancellable,
-                    GError             **error)
+extract_extra_data (FlatpakDir   *self,
+                    const char   *checksum,
+                    GFile        *extradir,
+                    gboolean     *created_extra_data,
+                    GCancellable *cancellable,
+                    GError      **error)
 {
   g_autoptr(GVariant) detached_metadata = NULL;
   g_autoptr(GVariant) extra_data = NULL;
@@ -5817,7 +5832,7 @@ extract_extra_data (FlatpakDir          *self,
           g_autoptr(GFile) dest = NULL;
           g_autofree char *sha256 = NULL;
           const char *extra_data_name = NULL;
-          const guchar  *data;
+          const guchar *data;
           gsize len;
 
           g_variant_get_child (extra_data, j, "(^ay@ay)",
@@ -5884,10 +5899,10 @@ child_setup (gpointer user_data)
 }
 
 static gboolean
-apply_extra_data (FlatpakDir          *self,
-                  GFile               *checkoutdir,
-                  GCancellable        *cancellable,
-                  GError             **error)
+apply_extra_data (FlatpakDir   *self,
+                  GFile        *checkoutdir,
+                  GCancellable *cancellable,
+                  GError      **error)
 {
   g_autoptr(GFile) metadata = NULL;
   g_autofree char *metadata_contents = NULL;
@@ -6647,7 +6662,7 @@ gboolean
 flatpak_dir_deploy_update (FlatpakDir   *self,
                            const char   *ref,
                            const char   *checksum_or_latest,
-                           const char **opt_subpaths,
+                           const char  **opt_subpaths,
                            GCancellable *cancellable,
                            GError      **error)
 {
@@ -6736,7 +6751,7 @@ flatpak_dir_create_system_child_oci_registry (FlatpakDir   *self,
   repo_dir = g_file_get_child (cache_dir, tmpdir_name);
   repo_url = g_file_get_uri (repo_dir);
 
-  new_registry = flatpak_oci_registry_new (repo_url, TRUE , -1,
+  new_registry = flatpak_oci_registry_new (repo_url, TRUE, -1,
                                            NULL, error);
   if (new_registry == NULL)
     return NULL;
@@ -7047,18 +7062,19 @@ flatpak_dir_install (FlatpakDir          *self,
 }
 
 char *
-flatpak_dir_ensure_bundle_remote (FlatpakDir          *self,
-                                  GFile               *file,
-                                  GBytes              *extra_gpg_data,
-                                  char               **out_ref,
-                                  char               **out_checksum,
-                                  char               **out_metadata,
-                                  gboolean            *out_created_remote,
-                                  GCancellable        *cancellable,
-                                  GError             **error)
+flatpak_dir_ensure_bundle_remote (FlatpakDir   *self,
+                                  GFile        *file,
+                                  GBytes       *extra_gpg_data,
+                                  char        **out_ref,
+                                  char        **out_checksum,
+                                  char        **out_metadata,
+                                  gboolean     *out_created_remote,
+                                  GCancellable *cancellable,
+                                  GError      **error)
 {
   g_autofree char *ref = NULL;
   gboolean created_remote = FALSE;
+
   g_autoptr(GVariant) deploy_data = NULL;
   g_autoptr(GVariant) metadata = NULL;
   g_autofree char *origin = NULL;
@@ -7154,8 +7170,8 @@ flatpak_dir_ensure_bundle_remote (FlatpakDir          *self,
  * should just write the remote config to the correct place, factoring
  * core.add-remotes-config-dir in. */
 static gboolean
-flatpak_dir_check_add_remotes_config_dir (FlatpakDir  *self,
-                                          GError     **error)
+flatpak_dir_check_add_remotes_config_dir (FlatpakDir *self,
+                                          GError    **error)
 {
   g_autoptr(GError) local_error = NULL;
   gboolean val;
@@ -7197,14 +7213,15 @@ flatpak_dir_check_add_remotes_config_dir (FlatpakDir  *self,
 }
 
 gboolean
-flatpak_dir_install_bundle (FlatpakDir          *self,
-                            GFile               *file,
-                            const char          *remote,
-                            char               **out_ref,
-                            GCancellable        *cancellable,
-                            GError             **error)
+flatpak_dir_install_bundle (FlatpakDir   *self,
+                            GFile        *file,
+                            const char   *remote,
+                            char        **out_ref,
+                            GCancellable *cancellable,
+                            GError      **error)
 {
   g_autofree char *ref = NULL;
+
   g_autoptr(GVariant) deploy_data = NULL;
   g_autoptr(GVariant) metadata = NULL;
   g_autofree char *origin = NULL;
@@ -7336,6 +7353,7 @@ _g_strv_equal0 (gchar **a, gchar **b)
 {
   gboolean ret = FALSE;
   guint n;
+
   if (a == NULL && b == NULL)
     {
       ret = TRUE;
@@ -7354,13 +7372,13 @@ out:
 }
 
 gboolean
-flatpak_dir_needs_update_for_commit_and_subpaths (FlatpakDir          *self,
-                                                  const char          *remote,
-                                                  const char          *ref,
-                                                  const char          *target_commit,
-                                                  const char         **opt_subpaths)
+flatpak_dir_needs_update_for_commit_and_subpaths (FlatpakDir  *self,
+                                                  const char  *remote,
+                                                  const char  *ref,
+                                                  const char  *target_commit,
+                                                  const char **opt_subpaths)
 {
- g_autoptr(GVariant) deploy_data = NULL;
+  g_autoptr(GVariant) deploy_data = NULL;
   g_autofree const char **old_subpaths = NULL;
   const char **subpaths;
   g_autofree char *url = NULL;
@@ -7402,7 +7420,7 @@ flatpak_dir_needs_update_for_commit_and_subpaths (FlatpakDir          *self,
   /* target commit is the same as current, but maybe something else that is different? */
 
   /* Same commit, but different subpaths => update */
-  if (!_g_strv_equal0 ((char **)subpaths, (char **)old_subpaths))
+  if (!_g_strv_equal0 ((char **) subpaths, (char **) old_subpaths))
     return TRUE;
 
   /* Same subpaths and commit, no need to update */
@@ -7410,15 +7428,15 @@ flatpak_dir_needs_update_for_commit_and_subpaths (FlatpakDir          *self,
 }
 
 char *
-flatpak_dir_check_for_update (FlatpakDir          *self,
-                              FlatpakRemoteState  *state,
-                              const char          *ref,
-                              const char          *checksum_or_latest,
-                              const char         **opt_subpaths,
-                              gboolean             no_pull,
+flatpak_dir_check_for_update (FlatpakDir               *self,
+                              FlatpakRemoteState       *state,
+                              const char               *ref,
+                              const char               *checksum_or_latest,
+                              const char              **opt_subpaths,
+                              gboolean                  no_pull,
                               OstreeRepoFinderResult ***out_results,
-                              GCancellable        *cancellable,
-                              GError             **error)
+                              GCancellable             *cancellable,
+                              GError                  **error)
 {
   g_autofree const char *remote_and_branch = NULL;
   g_autofree char *latest_rev = NULL;
@@ -7455,19 +7473,19 @@ flatpak_dir_check_for_update (FlatpakDir          *self,
 }
 
 gboolean
-flatpak_dir_update (FlatpakDir          *self,
-                    gboolean             no_pull,
-                    gboolean             no_deploy,
-                    gboolean             no_static_deltas,
-                    gboolean             allow_downgrade,
-                    FlatpakRemoteState  *state,
-                    const char          *ref,
-                    const char          *commit,
+flatpak_dir_update (FlatpakDir                           *self,
+                    gboolean                              no_pull,
+                    gboolean                              no_deploy,
+                    gboolean                              no_static_deltas,
+                    gboolean                              allow_downgrade,
+                    FlatpakRemoteState                   *state,
+                    const char                           *ref,
+                    const char                           *commit,
                     const OstreeRepoFinderResult * const *results,
-                    const char         **opt_subpaths,
-                    OstreeAsyncProgress *progress,
-                    GCancellable        *cancellable,
-                    GError             **error)
+                    const char                          **opt_subpaths,
+                    OstreeAsyncProgress                  *progress,
+                    GCancellable                         *cancellable,
+                    GError                              **error)
 {
   g_autoptr(GVariant) deploy_data = NULL;
   const char **subpaths = NULL;
@@ -7523,7 +7541,7 @@ flatpak_dir_update (FlatpakDir          *self,
       system_helper = flatpak_dir_get_system_helper (self);
       g_assert (system_helper != NULL);
 
-      if (!OSTREE_CHECK_VERSION(2017,13))
+      if (!OSTREE_CHECK_VERSION (2017, 13))
         {
           /* If the existing pull is partial, disable static deltas. They can
            * break on ostree < 2017.13 which doesn't look at the parent repo for
@@ -7653,17 +7671,18 @@ flatpak_dir_update (FlatpakDir          *self,
 }
 
 gboolean
-flatpak_dir_uninstall (FlatpakDir          *self,
-                       const char          *ref,
+flatpak_dir_uninstall (FlatpakDir                 *self,
+                       const char                 *ref,
                        FlatpakHelperUninstallFlags flags,
-                       GCancellable        *cancellable,
-                       GError             **error)
+                       GCancellable               *cancellable,
+                       GError                    **error)
 {
   const char *repository;
   g_autofree char *current_ref = NULL;
   gboolean was_deployed;
   gboolean is_app;
   const char *name;
+
   g_auto(GStrv) parts = NULL;
   g_auto(GLnxLockFile) lock = { 0, };
   g_autoptr(GVariant) deploy_data = NULL;
@@ -7732,7 +7751,7 @@ flatpak_dir_uninstall (FlatpakDir          *self,
 
       if (blocking->len > 1)
         {
-          g_autofree char *joined = g_strjoinv (", ", (char **)blocking->pdata);
+          g_autofree char *joined = g_strjoinv (", ", (char **) blocking->pdata);
           return flatpak_fail (error, "Can't remove %s, it is needed for: %s", pref, joined);
         }
     }
@@ -8308,6 +8327,7 @@ flatpak_dir_prune (FlatpakDir   *self,
   gint objects_total, objects_pruned;
   guint64 pruned_object_size_total;
   g_autofree char *formatted_freed_size = NULL;
+
   g_autoptr(GError) local_error = NULL;
   g_autoptr(GError) lock_error = NULL;
   g_auto(GLnxLockFile) lock = { 0, };
@@ -8367,7 +8387,7 @@ flatpak_dir_prune (FlatpakDir   *self,
 
   ret = TRUE;
 
- out:
+out:
 
   /* There was an issue in ostree where for local pulls we don't get a .commitpartial (now fixed),
      which caused errors when pruning. We print these here, but don't stop processing. */
@@ -8437,10 +8457,10 @@ flatpak_dir_get_if_deployed (FlatpakDir   *self,
 }
 
 GFile *
-flatpak_dir_get_unmaintained_extension_dir_if_exists (FlatpakDir *self,
-                                                      const char *name,
-                                                      const char *arch,
-                                                      const char *branch,
+flatpak_dir_get_unmaintained_extension_dir_if_exists (FlatpakDir   *self,
+                                                      const char   *name,
+                                                      const char   *arch,
+                                                      const char   *branch,
                                                       GCancellable *cancellable)
 {
   g_autoptr(GFile) extension_dir = NULL;
@@ -8457,9 +8477,9 @@ flatpak_dir_get_unmaintained_extension_dir_if_exists (FlatpakDir *self,
     return NULL;
 
   if (g_file_info_get_is_symlink (extension_dir_info))
-      return g_file_new_for_path (g_file_info_get_symlink_target (extension_dir_info));
+    return g_file_new_for_path (g_file_info_get_symlink_target (extension_dir_info));
   else
-      return g_steal_pointer (&extension_dir);
+    return g_steal_pointer (&extension_dir);
 }
 
 G_LOCK_DEFINE_STATIC (cache);
@@ -8477,12 +8497,13 @@ cached_summary_free (CachedSummary *summary)
 }
 
 static CachedSummary *
-cached_summary_new (GBytes *bytes,
-                    GBytes *bytes_sig,
+cached_summary_new (GBytes     *bytes,
+                    GBytes     *bytes_sig,
                     const char *remote,
                     const char *url)
 {
   CachedSummary *summary = g_new0 (CachedSummary, 1);
+
   summary->bytes = g_bytes_ref (bytes);
   if (bytes_sig)
     summary->bytes_sig = g_bytes_ref (bytes_sig);
@@ -8493,11 +8514,11 @@ cached_summary_new (GBytes *bytes,
 }
 
 static gboolean
-flatpak_dir_lookup_cached_summary (FlatpakDir  *self,
-                                   GBytes **bytes_out,
-                                   GBytes **bytes_sig_out,
-                                   const char  *name,
-                                   const char  *url)
+flatpak_dir_lookup_cached_summary (FlatpakDir *self,
+                                   GBytes    **bytes_out,
+                                   GBytes    **bytes_sig_out,
+                                   const char *name,
+                                   const char *url)
 {
   CachedSummary *summary;
   gboolean res = FALSE;
@@ -8505,7 +8526,7 @@ flatpak_dir_lookup_cached_summary (FlatpakDir  *self,
   G_LOCK (cache);
 
   if (self->summary_cache == NULL)
-    self->summary_cache = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify)cached_summary_free);
+    self->summary_cache = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) cached_summary_free);
 
   summary = g_hash_table_lookup (self->summary_cache, name);
   if (summary)
@@ -8533,17 +8554,17 @@ flatpak_dir_lookup_cached_summary (FlatpakDir  *self,
 }
 
 static void
-flatpak_dir_cache_summary (FlatpakDir  *self,
-                           GBytes      *bytes,
-                           GBytes      *bytes_sig,
-                           const char  *name,
-                           const char  *url)
+flatpak_dir_cache_summary (FlatpakDir *self,
+                           GBytes     *bytes,
+                           GBytes     *bytes_sig,
+                           const char *name,
+                           const char *url)
 {
   CachedSummary *summary;
 
   /* No sense caching the summary if there isn't one */
   if (!bytes)
-      return;
+    return;
 
   G_LOCK (cache);
 
@@ -8564,6 +8585,7 @@ flatpak_dir_remote_make_oci_summary (FlatpakDir   *self,
                                      GError      **error)
 {
   g_autofree char *oci_uri = NULL;
+
   g_autoptr(GVariant) summary = NULL;
   g_autoptr(GFile) cache_dir = NULL;
   g_autoptr(GFile) summary_cache = NULL;
@@ -8635,6 +8657,7 @@ flatpak_dir_remote_fetch_summary (FlatpakDir   *self,
 {
   g_autofree char *url = NULL;
   gboolean is_local;
+
   g_autoptr(GError) local_error = NULL;
   g_autoptr(GBytes) summary = NULL;
   g_autoptr(GBytes) summary_sig = NULL;
@@ -8875,9 +8898,9 @@ flatpak_dir_get_remote_state_local_only (FlatpakDir   *self,
 }
 
 static gboolean
-flatpak_dir_remote_has_ref (FlatpakDir   *self,
-                            const char   *remote,
-                            const char   *ref)
+flatpak_dir_remote_has_ref (FlatpakDir *self,
+                            const char *remote,
+                            const char *ref)
 {
   g_autoptr(GError) local_error = NULL;
   g_autoptr(FlatpakRemoteState) state = NULL;
@@ -8898,6 +8921,7 @@ populate_hash_table_from_refs_map (GHashTable *ret_all_refs, GVariant *ref_map,
 {
   GVariant *value;
   GVariantIter ref_iter;
+
   g_variant_iter_init (&ref_iter, ref_map);
   while ((value = g_variant_iter_next_value (&ref_iter)) != NULL)
     {
@@ -8933,9 +8957,9 @@ populate_hash_table_from_refs_map (GHashTable *ret_all_refs, GVariant *ref_map,
 static gboolean
 flatpak_dir_remote_list_refs (FlatpakDir         *self,
                               FlatpakRemoteState *state,
-                              GHashTable         **out_all_refs,
-                              GCancellable        *cancellable,
-                              GError             **error)
+                              GHashTable        **out_all_refs,
+                              GCancellable       *cancellable,
+                              GError            **error)
 {
   g_autoptr(GHashTable) ret_all_refs = NULL;
   g_autoptr(GVariant) ref_map = NULL;
@@ -9005,7 +9029,7 @@ flatpak_dir_remote_list_refs (FlatpakDir         *self,
     {
       g_variant_iter_init (&iter, collection_map);
       while (g_variant_iter_loop (&iter, "{&s@a(s(taya{sv}))}", &collection_id, &ref_map))
-          populate_hash_table_from_refs_map (ret_all_refs, ref_map, collection_id);
+        populate_hash_table_from_refs_map (ret_all_refs, ref_map, collection_id);
     }
 
 
@@ -9022,14 +9046,14 @@ typedef enum {
 
 /* Guarantees to return refs which are decomposable. */
 static GPtrArray *
-find_matching_refs (GHashTable *refs,
-                    const char   *opt_name,
-                    const char   *opt_branch,
-                    const char   *opt_arch,
-                    const char   *opt_collection_id,
-                    FlatpakKinds  kinds,
+find_matching_refs (GHashTable           *refs,
+                    const char           *opt_name,
+                    const char           *opt_branch,
+                    const char           *opt_arch,
+                    const char           *opt_collection_id,
+                    FlatpakKinds          kinds,
                     FindMatchingRefsFlags flags,
-                    GError      **error)
+                    GError              **error)
 {
   g_autoptr(GPtrArray) matched_refs = NULL;
   const char **arches = flatpak_get_arches ();
@@ -9103,14 +9127,14 @@ find_matching_refs (GHashTable *refs,
 
 
 static char *
-find_matching_ref (GHashTable *refs,
-                   const char   *name,
-                   const char   *opt_branch,
-                   const char   *opt_default_branch,
-                   const char   *opt_arch,
-                   const char   *opt_collection_id,
-                   FlatpakKinds  kinds,
-                   GError      **error)
+find_matching_ref (GHashTable  *refs,
+                   const char  *name,
+                   const char  *opt_branch,
+                   const char  *opt_default_branch,
+                   const char  *opt_arch,
+                   const char  *opt_collection_id,
+                   FlatpakKinds kinds,
+                   GError     **error)
 {
   const char **arches = flatpak_get_arches ();
   const char *opt_arches[] = {opt_arch, NULL};
@@ -9188,6 +9212,7 @@ flatpak_dir_get_remote_collection_id (FlatpakDir *self,
                                       const char *remote_name)
 {
   char *collection_id = NULL;
+
   repo_get_remote_collection_id (self->repo, remote_name, &collection_id, NULL);
   return collection_id;
 }
@@ -9196,15 +9221,16 @@ flatpak_dir_get_remote_collection_id (FlatpakDir *self,
  * we need a version which works with collections. */
 char **
 flatpak_dir_find_remote_refs (FlatpakDir   *self,
-                             const char   *remote,
-                             const char   *name,
-                             const char   *opt_branch,
-                             const char   *opt_arch,
-                             FlatpakKinds  kinds,
-                             GCancellable *cancellable,
-                             GError      **error)
+                              const char   *remote,
+                              const char   *name,
+                              const char   *opt_branch,
+                              const char   *opt_arch,
+                              FlatpakKinds  kinds,
+                              GCancellable *cancellable,
+                              GError      **error)
 {
   g_autofree char *collection_id = NULL;
+
   g_autoptr(GHashTable) remote_refs = NULL;
   g_autoptr(FlatpakRemoteState) state = NULL;
   GPtrArray *matched_refs;
@@ -9230,11 +9256,11 @@ flatpak_dir_find_remote_refs (FlatpakDir   *self,
     return NULL;
 
   g_ptr_array_add (matched_refs, NULL);
-  return (char **)g_ptr_array_free (matched_refs, FALSE);
+  return (char **) g_ptr_array_free (matched_refs, FALSE);
 }
 
 static char *
-find_ref_for_refs_set (GHashTable *refs,
+find_ref_for_refs_set (GHashTable   *refs,
                        const char   *name,
                        const char   *opt_branch,
                        const char   *opt_default_branch,
@@ -9302,6 +9328,7 @@ flatpak_dir_find_remote_ref (FlatpakDir   *self,
 {
   g_autofree char *collection_id = NULL;
   g_autofree char *remote_ref = NULL;
+
   g_autoptr(GHashTable) remote_refs = NULL;
   g_autoptr(FlatpakRemoteState) state = NULL;
   g_autoptr(GError) my_error = NULL;
@@ -9339,16 +9366,17 @@ flatpak_dir_find_remote_ref (FlatpakDir   *self,
 }
 
 static gboolean
-list_collection_refs_from_ostree_repo (OstreeRepo    *repo,
-                                       const char    *refspec_prefix,
-                                       const char    *opt_collection_id,
-                                       GHashTable   **out_all_refs,
-                                       GCancellable  *cancellable,
-                                       GError       **error)
+list_collection_refs_from_ostree_repo (OstreeRepo   *repo,
+                                       const char   *refspec_prefix,
+                                       const char   *opt_collection_id,
+                                       GHashTable  **out_all_refs,
+                                       GCancellable *cancellable,
+                                       GError      **error)
 {
   GHashTableIter iter;
   gpointer key;
   GHashTable *coll_refs = NULL;
+
   g_autoptr(GHashTable) refs = NULL;
 
   /* FIXME: Use ostree_repo_list_collection_refs when it's public */
@@ -9386,6 +9414,7 @@ flatpak_dir_find_local_ref (FlatpakDir   *self,
 {
   g_autofree char *local_ref = NULL;
   g_autofree char *collection_id = NULL;
+
   g_autoptr(GHashTable) local_refs = NULL;
   g_autoptr(GError) my_error = NULL;
   g_autofree char *refspec_prefix = g_strconcat (remote, ":.", NULL);
@@ -9477,12 +9506,12 @@ flatpak_dir_get_all_installed_refs (FlatpakDir  *self,
 }
 
 char **
-flatpak_dir_find_installed_refs (FlatpakDir *self,
-                                 const char *opt_name,
-                                 const char *opt_branch,
-                                 const char *opt_arch,
+flatpak_dir_find_installed_refs (FlatpakDir  *self,
+                                 const char  *opt_name,
+                                 const char  *opt_branch,
+                                 const char  *opt_arch,
                                  FlatpakKinds kinds,
-                                 GError    **error)
+                                 GError     **error)
 {
   g_autoptr(GHashTable) local_refs = NULL;
   GPtrArray *matched_refs;
@@ -9503,7 +9532,7 @@ flatpak_dir_find_installed_refs (FlatpakDir *self,
     return NULL;
 
   g_ptr_array_add (matched_refs, NULL);
-  return (char **)g_ptr_array_free (matched_refs, FALSE);
+  return (char **) g_ptr_array_free (matched_refs, FALSE);
 
 }
 
@@ -9517,6 +9546,7 @@ flatpak_dir_find_installed_ref (FlatpakDir   *self,
                                 GError      **error)
 {
   g_autofree char *local_ref = NULL;
+
   g_autoptr(GHashTable) local_refs = NULL;
   g_autoptr(GError) my_error = NULL;
 
@@ -9609,7 +9639,7 @@ filter_out_deployed_refs (FlatpakDir *self,
 gboolean
 flatpak_dir_cleanup_undeployed_refs (FlatpakDir   *self,
                                      GCancellable *cancellable,
-                                     GError       **error)
+                                     GError      **error)
 {
   g_autoptr(GHashTable) local_refspecs = NULL;
   g_autoptr(GPtrArray)  local_flatpak_refspecs = NULL;
@@ -9797,7 +9827,7 @@ flatpak_dir_get_remote_oci (FlatpakDir *self,
 
 char *
 flatpak_dir_get_remote_main_ref (FlatpakDir *self,
-                                const char *remote_name)
+                                 const char *remote_name)
 {
   GKeyFile *config = ostree_repo_get_config (self->repo);
   g_autofree char *group = get_group (remote_name);
@@ -9879,8 +9909,8 @@ flatpak_dir_get_remote_disabled (FlatpakDir *self,
 }
 
 gboolean
-flatpak_dir_remote_has_deploys (FlatpakDir   *self,
-                                const char   *remote)
+flatpak_dir_remote_has_deploys (FlatpakDir *self,
+                                const char *remote)
 {
   g_autoptr(GHashTable) refs = NULL;
   GHashTableIter hash_iter;
@@ -9925,12 +9955,12 @@ cmp_remote (gconstpointer a,
 }
 
 static gboolean
-origin_remote_matches (OstreeRepo   *repo,
-                       const char   *remote_name,
-                       const char   *url,
-                       const char   *main_ref,
-                       gboolean      gpg_verify,
-                       const char   *collection_id)
+origin_remote_matches (OstreeRepo *repo,
+                       const char *remote_name,
+                       const char *url,
+                       const char *main_ref,
+                       gboolean    gpg_verify,
+                       const char *collection_id)
 {
   g_autofree char *real_url = NULL;
   g_autofree char *real_main_ref = NULL;
@@ -9985,16 +10015,17 @@ origin_remote_matches (OstreeRepo   *repo,
 }
 
 static char *
-create_origin_remote_config (OstreeRepo   *repo,
-                             const char   *url,
-                             const char   *id,
-                             const char   *title,
-                             const char   *main_ref,
-                             gboolean      gpg_verify,
-                             const char   *collection_id,
-                             GKeyFile    **new_config)
+create_origin_remote_config (OstreeRepo *repo,
+                             const char *url,
+                             const char *id,
+                             const char *title,
+                             const char *main_ref,
+                             gboolean    gpg_verify,
+                             const char *collection_id,
+                             GKeyFile  **new_config)
 {
   g_autofree char *remote = NULL;
+
   g_auto(GStrv) remotes = NULL;
   int version = 0;
   g_autofree char *group = NULL;
@@ -10169,20 +10200,21 @@ flatpak_dir_parse_repofile (FlatpakDir   *self,
 
 static gboolean
 parse_ref_file (GKeyFile *keyfile,
-                char **name_out,
-                char **branch_out,
-                char **url_out,
-                char **title_out,
-                GBytes **gpg_data_out,
+                char    **name_out,
+                char    **branch_out,
+                char    **url_out,
+                char    **title_out,
+                GBytes  **gpg_data_out,
                 gboolean *is_runtime_out,
-                char **collection_id_out,
-                GError **error)
+                char    **collection_id_out,
+                GError  **error)
 {
   g_autofree char *url = NULL;
   g_autofree char *title = NULL;
   g_autofree char *name = NULL;
   g_autofree char *branch = NULL;
   g_autofree char *version = NULL;
+
   g_autoptr(GBytes) gpg_data = NULL;
   gboolean is_runtime = FALSE;
   g_autofree char *collection_id = NULL;
@@ -10286,8 +10318,8 @@ flatpak_dir_create_remote_for_ref_file (FlatpakDir *self,
   if (deploy_dir != NULL)
     {
       g_set_error (error, FLATPAK_ERROR, FLATPAK_ERROR_ALREADY_INSTALLED,
-                   is_runtime ? _("Runtime %s, branch %s is already installed")
-                   : _("App %s, branch %s is already installed"),
+                   is_runtime ? _("Runtime %s, branch %s is already installed") :
+                   _("App %s, branch %s is already installed"),
                    name, branch);
       return FALSE;
     }
@@ -10307,14 +10339,14 @@ flatpak_dir_create_remote_for_ref_file (FlatpakDir *self,
     *collection_id_out = g_steal_pointer (&collection_id);
 
   *remote_name_out = g_steal_pointer (&remote);
-  *ref_out = (char *)g_steal_pointer (&ref);
+  *ref_out = (char *) g_steal_pointer (&ref);
   return TRUE;
 }
 
 char *
-flatpak_dir_find_remote_by_uri (FlatpakDir   *self,
-                                const char   *uri,
-                                const char   *collection_id)
+flatpak_dir_find_remote_by_uri (FlatpakDir *self,
+                                const char *uri,
+                                const char *collection_id)
 {
   g_auto(GStrv) remotes = NULL;
 
@@ -10350,8 +10382,8 @@ flatpak_dir_find_remote_by_uri (FlatpakDir   *self,
 }
 
 gboolean
-flatpak_dir_has_remote (FlatpakDir   *self,
-                        const char   *remote_name)
+flatpak_dir_has_remote (FlatpakDir *self,
+                        const char *remote_name)
 {
   GKeyFile *config = NULL;
   g_autofree char *group = g_strdup_printf ("remote \"%s\"", remote_name);
@@ -10417,7 +10449,7 @@ flatpak_dir_list_enumerated_remotes (FlatpakDir   *self,
     }
 
   g_ptr_array_add (res, NULL);
-  return (char **)g_ptr_array_free (g_steal_pointer (&res), FALSE);
+  return (char **) g_ptr_array_free (g_steal_pointer (&res), FALSE);
 }
 
 char **
@@ -10447,7 +10479,7 @@ flatpak_dir_search_for_dependency (FlatpakDir   *self,
 
   g_ptr_array_add (found, NULL);
 
-  return (char **)g_ptr_array_free (g_steal_pointer (&found), FALSE);
+  return (char **) g_ptr_array_free (g_steal_pointer (&found), FALSE);
 }
 
 char **
@@ -10479,7 +10511,7 @@ flatpak_dir_search_for_local_dependency (FlatpakDir   *self,
 
   g_ptr_array_add (found, NULL);
 
-  return (char **)g_ptr_array_free (g_steal_pointer (&found), FALSE);
+  return (char **) g_ptr_array_free (g_steal_pointer (&found), FALSE);
 }
 
 gboolean
@@ -10490,6 +10522,7 @@ flatpak_dir_remove_remote (FlatpakDir   *self,
                            GError      **error)
 {
   g_autofree char *prefix = NULL;
+
   g_autoptr(GHashTable) refs = NULL;
   GHashTableIter hash_iter;
   gpointer key;
@@ -10591,6 +10624,7 @@ flatpak_dir_modify_remote (FlatpakDir   *self,
   g_autofree char *group = g_strdup_printf ("remote \"%s\"", remote_name);
   g_autofree char *url = NULL;
   g_autofree char *metalink = NULL;
+
   g_autoptr(GKeyFile) new_config = NULL;
   g_auto(GStrv) keys = NULL;
   int i;
@@ -10703,11 +10737,11 @@ remove_unless_in_hash (gpointer key,
 }
 
 gboolean
-flatpak_dir_list_remote_refs (FlatpakDir   *self,
+flatpak_dir_list_remote_refs (FlatpakDir         *self,
                               FlatpakRemoteState *state,
-                              GHashTable  **refs,
-                              GCancellable *cancellable,
-                              GError      **error)
+                              GHashTable        **refs,
+                              GCancellable       *cancellable,
+                              GError            **error)
 {
   g_autoptr(GError) my_error = NULL;
 
@@ -10754,10 +10788,10 @@ flatpak_dir_list_remote_refs (FlatpakDir   *self,
 }
 
 gboolean
-_flatpak_dir_fetch_remote_state_metadata_branch (FlatpakDir    *self,
+_flatpak_dir_fetch_remote_state_metadata_branch (FlatpakDir         *self,
                                                  FlatpakRemoteState *state, /* This state does not have metadata filled out yet */
-                                                 GCancellable  *cancellable,
-                                                 GError       **error)
+                                                 GCancellable       *cancellable,
+                                                 GError            **error)
 {
   FlatpakPullFlags flatpak_flags;
   gboolean gpg_verify;
@@ -10899,12 +10933,12 @@ _flatpak_dir_fetch_remote_state_metadata_branch (FlatpakDir    *self,
 }
 
 gboolean
-flatpak_dir_update_remote_configuration_for_state (FlatpakDir    *self,
+flatpak_dir_update_remote_configuration_for_state (FlatpakDir         *self,
                                                    FlatpakRemoteState *remote_state,
-                                                   gboolean       dry_run,
-                                                   gboolean      *has_changed_out,
-                                                   GCancellable  *cancellable,
-                                                   GError       **error)
+                                                   gboolean            dry_run,
+                                                   gboolean           *has_changed_out,
+                                                   GCancellable       *cancellable,
+                                                   GError            **error)
 {
   /* We only support those configuration parameters that can
      be set in the server when building the repo (see the
@@ -10952,7 +10986,7 @@ flatpak_dir_update_remote_configuration_for_state (FlatpakDir    *self,
                 }
               else if (g_variant_is_of_type (value_var, G_VARIANT_TYPE_STRING))
                 {
-                  const char *value = g_variant_get_string(value_var, NULL);
+                  const char *value = g_variant_get_string (value_var, NULL);
                   if (value != NULL && *value != 0)
                     {
                       if (strcmp (key, "xa.redirect-url") == 0)
@@ -10972,66 +11006,66 @@ flatpak_dir_update_remote_configuration_for_state (FlatpakDir    *self,
     }
 
   if (updated_params->len > 0)
-  {
-    g_autoptr(GKeyFile) config = NULL;
-    g_autofree char *group = NULL;
-    gboolean has_changed = FALSE;
-    int i;
+    {
+      g_autoptr(GKeyFile) config = NULL;
+      g_autofree char *group = NULL;
+      gboolean has_changed = FALSE;
+      int i;
 
-    config = ostree_repo_copy_config (flatpak_dir_get_repo (self));
-    group = g_strdup_printf ("remote \"%s\"", remote_state->remote_name);
+      config = ostree_repo_copy_config (flatpak_dir_get_repo (self));
+      group = g_strdup_printf ("remote \"%s\"", remote_state->remote_name);
 
-    i = 0;
-    while (i < (updated_params->len - 1))
-      {
-        /* This array should have an even number of elements with
-           keys in the odd positions and values on even ones. */
-        const char *key = g_ptr_array_index (updated_params, i);
-        const char *new_val = g_ptr_array_index (updated_params, i+1);
-        g_autofree char *current_val = NULL;
-        g_autofree char *is_set_key = g_strconcat (key, "-is-set", NULL);
-        gboolean is_set = FALSE;
-
-        is_set = g_key_file_get_boolean (config, group, is_set_key, NULL);
-        if (!is_set)
-          {
-            current_val = g_key_file_get_string (config, group, key, NULL);
-            if ((!g_str_equal (key, "collection-id") &&
-                 g_strcmp0 (current_val, new_val) != 0) ||
-                (g_str_equal (key, "collection-id") &&
-                 (current_val == NULL || *current_val == '\0') &&
-                 new_val != NULL && *new_val != '\0'))
-              {
-                has_changed = TRUE;
-                g_key_file_set_string (config, group, key, new_val);
-
-                /* Special case for collection-id: if it’s set, gpg-verify-summary
-                 * must be set to false. The logic above ensures that the
-                 * collection-id is only set if we’re transitioning from an
-                 * unset to a set collection-ID. We *must not* allow the
-                 * collection ID to be changed from one set value to another
-                 * without the user manually verifying it; or a malicious
-                 * repository could assume the collection ID of another without
-                 * the user’s consent. */
-                if (g_str_equal (key, "collection-id") &&
-                    new_val != NULL && *new_val != '\0')
-                  g_key_file_set_boolean (config, group, "gpg-verify-summary", FALSE);
-              }
-          }
-
-        i += 2;
-      }
+      i = 0;
+      while (i < (updated_params->len - 1))
+        {
+          /* This array should have an even number of elements with
+             keys in the odd positions and values on even ones. */
+          const char *key = g_ptr_array_index (updated_params, i);
+          const char *new_val = g_ptr_array_index (updated_params, i + 1);
+          g_autofree char *current_val = NULL;
+          g_autofree char *is_set_key = g_strconcat (key, "-is-set", NULL);
+          gboolean is_set = FALSE;
 
-    if (has_changed_out)
-      *has_changed_out = has_changed;
+          is_set = g_key_file_get_boolean (config, group, is_set_key, NULL);
+          if (!is_set)
+            {
+              current_val = g_key_file_get_string (config, group, key, NULL);
+              if ((!g_str_equal (key, "collection-id") &&
+                   g_strcmp0 (current_val, new_val) != 0) ||
+                  (g_str_equal (key, "collection-id") &&
+                   (current_val == NULL || *current_val == '\0') &&
+                   new_val != NULL && *new_val != '\0'))
+                {
+                  has_changed = TRUE;
+                  g_key_file_set_string (config, group, key, new_val);
+
+                  /* Special case for collection-id: if it’s set, gpg-verify-summary
+                   * must be set to false. The logic above ensures that the
+                   * collection-id is only set if we’re transitioning from an
+                   * unset to a set collection-ID. We *must not* allow the
+                   * collection ID to be changed from one set value to another
+                   * without the user manually verifying it; or a malicious
+                   * repository could assume the collection ID of another without
+                   * the user’s consent. */
+                  if (g_str_equal (key, "collection-id") &&
+                      new_val != NULL && *new_val != '\0')
+                    g_key_file_set_boolean (config, group, "gpg-verify-summary", FALSE);
+                }
+            }
 
-    if (dry_run || !has_changed)
-      return TRUE;
+          i += 2;
+        }
 
-    /* Update the local remote configuration with the updated info. */
-    if (!flatpak_dir_modify_remote (self, remote_state->remote_name, config, gpg_keys, cancellable, error))
-      return FALSE;
-  }
+      if (has_changed_out)
+        *has_changed_out = has_changed;
+
+      if (dry_run || !has_changed)
+        return TRUE;
+
+      /* Update the local remote configuration with the updated info. */
+      if (!flatpak_dir_modify_remote (self, remote_state->remote_name, config, gpg_keys, cancellable, error))
+        return FALSE;
+    }
 
   return TRUE;
 }
@@ -11043,6 +11077,7 @@ flatpak_dir_update_remote_configuration (FlatpakDir   *self,
                                          GError      **error)
 {
   gboolean is_oci;
+
   g_autoptr(FlatpakRemoteState) state = NULL;
 
   if (flatpak_dir_get_remote_disabled (self, remote))
@@ -11143,6 +11178,7 @@ flatpak_dir_fetch_remote_object (FlatpakDir   *self,
   g_autofree char *object_url = NULL;
   g_autofree char *part1 = NULL;
   g_autofree char *part2 = NULL;
+
   g_autoptr(GBytes) bytes = NULL;
 
   if (!ostree_repo_remote_get_url (self->repo, remote_name, &base_url, error))
@@ -11219,7 +11255,7 @@ flatpak_dir_fetch_remote_commit (FlatpakDir   *self,
       if ((g_variant_lookup (commit_metadata, "xa.ref", "&s", &xa_ref) &&
            g_strcmp0 (xa_ref, ref) != 0) ||
           (g_variant_lookup (commit_metadata, OSTREE_COMMIT_META_KEY_REF_BINDING, "^a&s", &commit_refs) &&
-           !g_strv_contains ((const char *const *) commit_refs, ref)))
+           !g_strv_contains ((const char * const *) commit_refs, ref)))
         {
           flatpak_fail (error, "commit has no requested ref ‘%s’ in ref binding metadata",  ref);
           return NULL;
@@ -11244,16 +11280,16 @@ flatpak_related_free (FlatpakRelated *self)
 
 static void
 add_related (FlatpakDir *self,
-             GPtrArray *related,
+             GPtrArray  *related,
              const char *extension,
              const char *extension_collection_id,
              const char *extension_ref,
              const char *checksum,
-             gboolean no_autodownload,
+             gboolean    no_autodownload,
              const char *download_if,
              const char *autoprune_unless,
-             gboolean autodelete,
-             gboolean locale_subset)
+             gboolean    autodelete,
+             gboolean    locale_subset)
 {
   g_autoptr(GVariant) deploy_data = NULL;
   g_autofree const char **old_subpaths = NULL;
@@ -11314,7 +11350,7 @@ add_related (FlatpakDir *self,
       delete = TRUE;
     }
 
-  subpaths = flatpak_subpaths_merge ((char **)old_subpaths, extra_subpaths);
+  subpaths = flatpak_subpaths_merge ((char **) old_subpaths, extra_subpaths);
 
   rel = g_new0 (FlatpakRelated, 1);
   rel->collection_id = g_strdup (extension_collection_id);
@@ -11329,16 +11365,17 @@ add_related (FlatpakDir *self,
 }
 
 GPtrArray *
-flatpak_dir_find_remote_related_for_metadata (FlatpakDir *self,
+flatpak_dir_find_remote_related_for_metadata (FlatpakDir         *self,
                                               FlatpakRemoteState *state,
-                                              const char *ref,
-                                              GKeyFile *metakey,
-                                              GCancellable *cancellable,
-                                              GError **error)
+                                              const char         *ref,
+                                              GKeyFile           *metakey,
+                                              GCancellable       *cancellable,
+                                              GError            **error)
 {
   int i;
+
   g_auto(GStrv) parts = NULL;
-  g_autoptr(GPtrArray) related = g_ptr_array_new_with_free_func ((GDestroyNotify)flatpak_related_free);
+  g_autoptr(GPtrArray) related = g_ptr_array_new_with_free_func ((GDestroyNotify) flatpak_related_free);
   g_autofree char *url = NULL;
   g_auto(GStrv) groups = NULL;
 
@@ -11392,7 +11429,7 @@ flatpak_dir_find_remote_related_for_metadata (FlatpakDir *self,
           flatpak_parse_extension_with_tag (tagged_extension, &extension, NULL);
 
           if (versions)
-            branches = (const char **)versions;
+            branches = (const char **) versions;
           else
             {
               if (version)
@@ -11452,13 +11489,14 @@ flatpak_dir_find_remote_related_for_metadata (FlatpakDir *self,
 
 
 GPtrArray *
-flatpak_dir_find_remote_related (FlatpakDir *self,
+flatpak_dir_find_remote_related (FlatpakDir         *self,
                                  FlatpakRemoteState *state,
-                                 const char *ref,
-                                 GCancellable *cancellable,
-                                 GError **error)
+                                 const char         *ref,
+                                 GCancellable       *cancellable,
+                                 GError            **error)
 {
   const char *metadata = NULL;
+
   g_autoptr(GKeyFile) metakey = g_key_file_new ();
   g_auto(GStrv) parts = NULL;
   g_autoptr(GPtrArray) related = NULL;
@@ -11483,7 +11521,7 @@ flatpak_dir_find_remote_related (FlatpakDir *self,
       g_key_file_load_from_data (metakey, metadata, -1, 0, NULL))
     related = flatpak_dir_find_remote_related_for_metadata (self, state, ref, metakey, cancellable, error);
   else
-    related = g_ptr_array_new_with_free_func ((GDestroyNotify)flatpak_related_free);
+    related = g_ptr_array_new_with_free_func ((GDestroyNotify) flatpak_related_free);
 
   return g_steal_pointer (&related);
 }
@@ -11494,6 +11532,7 @@ local_match_prefix (FlatpakDir *self,
                     const char *remote)
 {
   GPtrArray *matches = g_ptr_array_new_with_free_func (g_free);
+
   g_auto(GStrv) parts = NULL;
   g_autofree char *parts_prefix = NULL;
   g_autoptr(GHashTable) refs = NULL;
@@ -11536,16 +11575,17 @@ local_match_prefix (FlatpakDir *self,
 }
 
 GPtrArray *
-flatpak_dir_find_local_related_for_metadata (FlatpakDir *self,
-                                             const char *ref,
-                                             const char *remote_name,
-                                             GKeyFile *metakey,
+flatpak_dir_find_local_related_for_metadata (FlatpakDir   *self,
+                                             const char   *ref,
+                                             const char   *remote_name,
+                                             GKeyFile     *metakey,
                                              GCancellable *cancellable,
-                                             GError **error)
+                                             GError      **error)
 {
   int i;
+
   g_auto(GStrv) parts = NULL;
-  g_autoptr(GPtrArray) related = g_ptr_array_new_with_free_func ((GDestroyNotify)flatpak_related_free);
+  g_autoptr(GPtrArray) related = g_ptr_array_new_with_free_func ((GDestroyNotify) flatpak_related_free);
   g_autofree char *collection_id = NULL;
   g_auto(GStrv) groups = NULL;
 
@@ -11659,12 +11699,12 @@ flatpak_dir_find_local_related_for_metadata (FlatpakDir *self,
 
 
 GPtrArray *
-flatpak_dir_find_local_related (FlatpakDir *self,
-                                const char *ref,
-                                const char *remote_name,
-                                gboolean deployed,
+flatpak_dir_find_local_related (FlatpakDir   *self,
+                                const char   *ref,
+                                const char   *remote_name,
+                                gboolean      deployed,
                                 GCancellable *cancellable,
-                                GError **error)
+                                GError      **error)
 {
   g_autoptr(GFile) deploy_dir = NULL;
   g_autoptr(GFile) metadata = NULL;
@@ -11708,7 +11748,7 @@ flatpak_dir_find_local_related (FlatpakDir *self,
       g_key_file_load_from_data (metakey, metadata_contents, -1, 0, NULL))
     related = flatpak_dir_find_local_related_for_metadata (self, ref, remote_name, metakey, cancellable, error);
   else
-    related = g_ptr_array_new_with_free_func ((GDestroyNotify)flatpak_related_free);
+    related = g_ptr_array_new_with_free_func ((GDestroyNotify) flatpak_related_free);
 
   return g_steal_pointer (&related);
 }
@@ -11739,6 +11779,7 @@ get_locale_langs_from_accounts_dbus (GDBusProxy *proxy)
   const char *accounts_bus_name = "org.freedesktop.Accounts";
   const char *accounts_interface_name = "org.freedesktop.Accounts.User";
   char **object_paths = NULL;
+
   g_autoptr(GPtrArray) langs = g_ptr_array_new ();
   int i;
   g_autoptr(GVariant) ret = NULL;
@@ -11788,7 +11829,7 @@ get_locale_langs_from_accounts_dbus (GDBusProxy *proxy)
                 }
             }
         }
-  }
+    }
 
   if (langs->len == 0)
     return NULL; /* No defined languages, fall back to all languages */
@@ -11796,7 +11837,7 @@ get_locale_langs_from_accounts_dbus (GDBusProxy *proxy)
   g_ptr_array_sort (langs, flatpak_strcmp0_ptr);
   g_ptr_array_add (langs, NULL);
 
-  return (char **)g_ptr_array_free (g_steal_pointer (&langs), FALSE);
+  return (char **) g_ptr_array_free (g_steal_pointer (&langs), FALSE);
 }
 
 static int
@@ -11906,10 +11947,10 @@ flatpak_collection_ref_hash (gconstpointer ref)
 
 gboolean
 flatpak_collection_ref_equal (gconstpointer ref1,
-                             gconstpointer ref2)
+                              gconstpointer ref2)
 {
   const FlatpakCollectionRef *_ref1 = ref1, *_ref2 = ref2;
 
-  return (g_strcmp0 (_ref1->collection_id, _ref2->collection_id) == 0 &&
-          g_strcmp0 (_ref1->ref_name, _ref2->ref_name) == 0);
+  return g_strcmp0 (_ref1->collection_id, _ref2->collection_id) == 0 &&
+         g_strcmp0 (_ref1->ref_name, _ref2->ref_name) == 0;
 }
diff --git a/common/flatpak-exports-private.h b/common/flatpak-exports-private.h
index 49f6ee8d..64cf59a6 100644
--- a/common/flatpak-exports-private.h
+++ b/common/flatpak-exports-private.h
@@ -36,24 +36,24 @@ typedef struct _FlatpakExports FlatpakExports;
 void flatpak_exports_free (FlatpakExports *exports);
 FlatpakExports *flatpak_exports_new (void);
 void flatpak_exports_append_bwrap_args (FlatpakExports *exports,
-                                        FlatpakBwrap *bwrap);
-void flatpak_exports_add_home_expose (FlatpakExports *exports,
+                                        FlatpakBwrap   *bwrap);
+void flatpak_exports_add_home_expose (FlatpakExports       *exports,
                                       FlatpakFilesystemMode mode);
-void flatpak_exports_add_path_expose (FlatpakExports *exports,
+void flatpak_exports_add_path_expose (FlatpakExports       *exports,
                                       FlatpakFilesystemMode mode,
-                                      const char *path);
+                                      const char           *path);
 void flatpak_exports_add_path_tmpfs (FlatpakExports *exports,
-                                 const char *path);
-void flatpak_exports_add_path_expose_or_hide (FlatpakExports *exports,
-                                          FlatpakFilesystemMode mode,
-                                          const char *path);
+                                     const char     *path);
+void flatpak_exports_add_path_expose_or_hide (FlatpakExports       *exports,
+                                              FlatpakFilesystemMode mode,
+                                              const char           *path);
 void flatpak_exports_add_path_dir (FlatpakExports *exports,
-                                   const char *path);
+                                   const char     *path);
 
 gboolean flatpak_exports_path_is_visible (FlatpakExports *exports,
-                                          const char *path);
+                                          const char     *path);
 FlatpakFilesystemMode flatpak_exports_path_get_mode (FlatpakExports *exports,
-                                                     const char *path);
+                                                     const char     *path);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakExports, flatpak_exports_free);
 
diff --git a/common/flatpak-exports.c b/common/flatpak-exports.c
index 807f04d0..6f4411de 100644
--- a/common/flatpak-exports.c
+++ b/common/flatpak-exports.c
@@ -83,13 +83,15 @@ make_relative (const char *base, const char *path)
 #define FAKE_MODE_TMPFS 0
 #define FAKE_MODE_SYMLINK G_MAXINT
 
-typedef struct {
+typedef struct
+{
   char *path;
-  gint mode;
+  gint  mode;
 } ExportedPath;
 
-struct _FlatpakExports {
-  GHashTable *hash;
+struct _FlatpakExports
+{
+  GHashTable           *hash;
   FlatpakFilesystemMode host_fs;
 };
 
@@ -104,7 +106,8 @@ FlatpakExports *
 flatpak_exports_new (void)
 {
   FlatpakExports *exports = g_new0 (FlatpakExports, 1);
-  exports->hash = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GFreeFunc)exported_path_free);
+
+  exports->hash = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GFreeFunc) exported_path_free);
   return exports;
 }
 
@@ -119,9 +122,9 @@ flatpak_exports_free (FlatpakExports *exports)
    is not visible due to parents being exported */
 static gboolean
 path_parent_is_mapped (const char **keys,
-                       guint n_keys,
-                       GHashTable *hash_table,
-                       const char *path)
+                       guint        n_keys,
+                       GHashTable  *hash_table,
+                       const char  *path)
 {
   guint i;
   gboolean is_mapped = FALSE;
@@ -148,10 +151,10 @@ path_parent_is_mapped (const char **keys,
 
 static gboolean
 path_is_mapped (const char **keys,
-                guint n_keys,
-                GHashTable *hash_table,
-                const char *path,
-                gboolean *is_readonly_out)
+                guint        n_keys,
+                GHashTable  *hash_table,
+                const char  *path,
+                gboolean    *is_readonly_out)
 {
   guint i;
   gboolean is_mapped = FALSE;
@@ -218,15 +221,16 @@ path_is_symlink (const char *path)
 
 void
 flatpak_exports_append_bwrap_args (FlatpakExports *exports,
-                                   FlatpakBwrap *bwrap)
+                                   FlatpakBwrap   *bwrap)
 {
   guint n_keys;
-  g_autofree const char **keys = (const char **)g_hash_table_get_keys_as_array (exports->hash, &n_keys);
+  g_autofree const char **keys = (const char **) g_hash_table_get_keys_as_array (exports->hash, &n_keys);
+
   g_autoptr(GList) eps = NULL;
   GList *l;
 
   eps = g_hash_table_get_values (exports->hash);
-  eps = g_list_sort (eps, (GCompareFunc)compare_eps);
+  eps = g_list_sort (eps, (GCompareFunc) compare_eps);
 
   g_qsort_with_data (keys, n_keys, sizeof (char *), (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
 
@@ -290,12 +294,13 @@ flatpak_exports_append_bwrap_args (FlatpakExports *exports,
 /* Returns 0 if not visible */
 FlatpakFilesystemMode
 flatpak_exports_path_get_mode (FlatpakExports *exports,
-                               const char *path)
+                               const char     *path)
 {
   guint n_keys;
-  g_autofree const char **keys = (const char **)g_hash_table_get_keys_as_array (exports->hash, &n_keys);
+  g_autofree const char **keys = (const char **) g_hash_table_get_keys_as_array (exports->hash, &n_keys);
   g_autofree char *canonical = NULL;
   gboolean is_readonly = FALSE;
+
   g_auto(GStrv) parts = NULL;
   int i;
   g_autoptr(GString) path_builder = g_string_new ("");
@@ -305,7 +310,7 @@ flatpak_exports_path_get_mode (FlatpakExports *exports,
 
   path = canonical = flatpak_canonicalize_filename (path);
 
-  parts = g_strsplit (path+1, "/", -1);
+  parts = g_strsplit (path + 1, "/", -1);
 
   /* A path is visible in the sandbox if no parent
    * path element that is mapped in the sandbox is
@@ -322,7 +327,7 @@ flatpak_exports_path_get_mode (FlatpakExports *exports,
         {
           if (lstat (path_builder->str, &st) != 0)
             {
-              if (errno == ENOENT && parts[i+1] == NULL && !is_readonly)
+              if (errno == ENOENT && parts[i + 1] == NULL && !is_readonly)
                 {
                   /* Last element was mapped but isn't there, this is
                    * OK (used for the save case) if we the parent is
@@ -355,7 +360,7 @@ flatpak_exports_path_get_mode (FlatpakExports *exports,
               return flatpak_exports_path_get_mode (exports, path2_builder->str);
             }
         }
-      else if (parts[i+1] == NULL)
+      else if (parts[i + 1] == NULL)
         return 0; /* Last part was not mapped */
     }
 
@@ -367,7 +372,7 @@ flatpak_exports_path_get_mode (FlatpakExports *exports,
 
 gboolean
 flatpak_exports_path_is_visible (FlatpakExports *exports,
-                                 const char *path)
+                                 const char     *path)
 {
   return flatpak_exports_path_get_mode (exports, path) > 0;
 }
@@ -386,8 +391,8 @@ never_export_as_symlink (const char *path)
 
 static void
 do_export_path (FlatpakExports *exports,
-                const char *path,
-                gint mode)
+                const char     *path,
+                gint            mode)
 {
   ExportedPath *old_ep = g_hash_table_lookup (exports->hash, path);
   ExportedPath *ep;
@@ -425,7 +430,7 @@ check_if_autofs_works (const char *path)
   fcntl (selfpipe[0], F_SETFL, fcntl (selfpipe[0], F_GETFL) | O_NONBLOCK);
   fcntl (selfpipe[1], F_SETFL, fcntl (selfpipe[1], F_GETFL) | O_NONBLOCK);
 
-  pid = fork();
+  pid = fork ();
   if (pid == -1)
     {
       close (selfpipe[0]);
@@ -438,7 +443,7 @@ check_if_autofs_works (const char *path)
       /* Note: open, close and _exit are signal-async-safe, so it is ok to call in the child after fork */
 
       close (selfpipe[0]); /* Close unused read end */
-      int dir_fd = open (path, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_DIRECTORY);
+      int dir_fd = open (path, O_RDONLY | O_NONBLOCK | O_CLOEXEC | O_DIRECTORY);
       _exit (dir_fd == -1 ? 1 : 0);
     }
 
@@ -451,7 +456,7 @@ check_if_autofs_works (const char *path)
 
   FD_ZERO (&rfds);
   FD_SET (selfpipe[0], &rfds);
-  res = select (selfpipe[0]+1, &rfds, NULL, NULL, &timeout);
+  res = select (selfpipe[0] + 1, &rfds, NULL, NULL, &timeout);
 
   close (selfpipe[0]);
 
@@ -467,7 +472,7 @@ check_if_autofs_works (const char *path)
   if (res == -1 /* Error */ || res == 0) /* Timeout */
     return FALSE;
 
-  if (!WIFEXITED(wstatus) || WEXITSTATUS(wstatus) != 0)
+  if (!WIFEXITED (wstatus) || WEXITSTATUS (wstatus) != 0)
     return FALSE;
 
   return TRUE;
@@ -476,9 +481,9 @@ check_if_autofs_works (const char *path)
 /* We use level to avoid infinite recursion */
 static gboolean
 _exports_path_expose (FlatpakExports *exports,
-                      int mode,
-                      const char *path,
-                      int level)
+                      int             mode,
+                      const char     *path,
+                      int             level)
 {
   g_autofree char *canonical = NULL;
   struct stat st;
@@ -581,24 +586,24 @@ _exports_path_expose (FlatpakExports *exports,
 }
 
 void
-flatpak_exports_add_path_expose (FlatpakExports *exports,
+flatpak_exports_add_path_expose (FlatpakExports       *exports,
                                  FlatpakFilesystemMode mode,
-                                 const char *path)
+                                 const char           *path)
 {
   _exports_path_expose (exports, mode, path, 0);
 }
 
 void
 flatpak_exports_add_path_tmpfs (FlatpakExports *exports,
-                                const char *path)
+                                const char     *path)
 {
   _exports_path_expose (exports, FAKE_MODE_TMPFS, path, 0);
 }
 
 void
-flatpak_exports_add_path_expose_or_hide (FlatpakExports *exports,
+flatpak_exports_add_path_expose_or_hide (FlatpakExports       *exports,
                                          FlatpakFilesystemMode mode,
-                                         const char *path)
+                                         const char           *path)
 {
   if (mode == 0)
     flatpak_exports_add_path_tmpfs (exports, path);
@@ -608,13 +613,13 @@ flatpak_exports_add_path_expose_or_hide (FlatpakExports *exports,
 
 void
 flatpak_exports_add_path_dir (FlatpakExports *exports,
-                              const char *path)
+                              const char     *path)
 {
   _exports_path_expose (exports, FAKE_MODE_DIR, path, 0);
 }
 
 void
-flatpak_exports_add_home_expose (FlatpakExports *exports,
+flatpak_exports_add_home_expose (FlatpakExports       *exports,
                                  FlatpakFilesystemMode mode)
 {
   exports->host_fs = mode;
diff --git a/common/flatpak-installation-private.h b/common/flatpak-installation-private.h
index bc5436c6..6e25b237 100644
--- a/common/flatpak-installation-private.h
+++ b/common/flatpak-installation-private.h
@@ -25,17 +25,14 @@
 
 #include "flatpak-dir-private.h"
 
-FlatpakDir *
-flatpak_installation_clone_dir_noensure (FlatpakInstallation *self);
+FlatpakDir *flatpak_installation_clone_dir_noensure (FlatpakInstallation *self);
 
-FlatpakDir *
-flatpak_installation_clone_dir (FlatpakInstallation *self,
-                                GCancellable  *cancellable,
-                                GError       **error);
+FlatpakDir *flatpak_installation_clone_dir (FlatpakInstallation *self,
+                                            GCancellable        *cancellable,
+                                            GError             **error);
 
-FlatpakInstallation *
-flatpak_installation_new_for_dir (FlatpakDir   *dir,
-                                  GCancellable *cancellable,
-                                  GError      **error);
+FlatpakInstallation *flatpak_installation_new_for_dir (FlatpakDir   *dir,
+                                                       GCancellable *cancellable,
+                                                       GError      **error);
 
 #endif /* __FLATPAK_INSTALLATION_PRIVATE_H__ */
diff --git a/common/flatpak-installation.c b/common/flatpak-installation.c
index 7c545893..65784284 100644
--- a/common/flatpak-installation.c
+++ b/common/flatpak-installation.c
@@ -192,7 +192,7 @@ flatpak_get_default_arch (void)
 const char * const *
 flatpak_get_supported_arches (void)
 {
-  return (const char * const *)flatpak_get_arches ();
+  return (const char * const *) flatpak_get_arches ();
 }
 
 /**
@@ -250,7 +250,7 @@ flatpak_get_system_installations (GCancellable *cancellable,
 
   ret = g_steal_pointer (&installs);
 
- out:
+out:
   return ret;
 }
 
@@ -399,8 +399,8 @@ flatpak_installation_clone_dir_noensure (FlatpakInstallation *self)
 
 FlatpakDir *
 flatpak_installation_clone_dir (FlatpakInstallation *self,
-                                GCancellable  *cancellable,
-                                GError       **error)
+                                GCancellable        *cancellable,
+                                GError             **error)
 {
   g_autoptr(FlatpakDir) dir_clone = NULL;
   g_autoptr(FlatpakDir) dir = NULL;
@@ -430,8 +430,8 @@ flatpak_installation_clone_dir (FlatpakInstallation *self,
  */
 gboolean
 flatpak_installation_drop_caches (FlatpakInstallation *self,
-                                  GCancellable *cancellable,
-                                  GError      **error)
+                                  GCancellable        *cancellable,
+                                  GError             **error)
 {
   FlatpakInstallationPrivate *priv = flatpak_installation_get_instance_private (self);
   FlatpakDir *clone, *old;
@@ -632,10 +632,10 @@ flatpak_installation_launch (FlatpakInstallation *self,
 
 
 static FlatpakInstalledRef *
-get_ref (FlatpakDir          *dir,
-         const char          *full_ref,
-         GCancellable        *cancellable,
-         GError **error)
+get_ref (FlatpakDir   *dir,
+         const char   *full_ref,
+         GCancellable *cancellable,
+         GError      **error)
 {
   g_auto(GStrv) parts = NULL;
   const char *origin = NULL;
@@ -889,6 +889,7 @@ async_result_cb (GObject      *obj,
                  gpointer      user_data)
 {
   GAsyncResult **result_out = user_data;
+
   *result_out = g_object_ref (result);
 }
 
@@ -1064,26 +1065,26 @@ flatpak_installation_list_installed_refs_for_update (FlatpakInstallation *self,
            * ref_to_timestamp to know if the commit is an update or a
            * downgrade.
            */
-            {
-              guint64 local_timestamp = 0;
-              guint64 *remote_timestamp;
-              g_autoptr(GVariant) commit_v = NULL;
+          {
+            guint64 local_timestamp = 0;
+            guint64 *remote_timestamp;
+            g_autoptr(GVariant) commit_v = NULL;
 
-              if (ostree_repo_load_commit (flatpak_dir_get_repo (dir), local_commit, &commit_v, NULL, NULL))
-                local_timestamp = ostree_commit_get_timestamp (commit_v);
+            if (ostree_repo_load_commit (flatpak_dir_get_repo (dir), local_commit, &commit_v, NULL, NULL))
+              local_timestamp = ostree_commit_get_timestamp (commit_v);
 
-              remote_timestamp = g_hash_table_lookup (results[j]->ref_to_timestamp, collection_ref);
-              *remote_timestamp = GUINT64_FROM_BE (*remote_timestamp);
+            remote_timestamp = g_hash_table_lookup (results[j]->ref_to_timestamp, collection_ref);
+            *remote_timestamp = GUINT64_FROM_BE (*remote_timestamp);
 
-              g_debug ("%s: Comparing local timestamp %" G_GUINT64_FORMAT " to remote timestamp %"
-                       G_GUINT64_FORMAT " on ref (%s, %s)", G_STRFUNC, local_timestamp, *remote_timestamp,
-                       collection_ref->collection_id, collection_ref->ref_name);
+            g_debug ("%s: Comparing local timestamp %" G_GUINT64_FORMAT " to remote timestamp %"
+                     G_GUINT64_FORMAT " on ref (%s, %s)", G_STRFUNC, local_timestamp, *remote_timestamp,
+                     collection_ref->collection_id, collection_ref->ref_name);
 
-              /* The timestamp could be 0 due to an error reading it. Assume
-               * it's an update until proven otherwise. */
-              if (*remote_timestamp != 0 && *remote_timestamp <= local_timestamp)
-                continue;
-            }
+            /* The timestamp could be 0 due to an error reading it. Assume
+             * it's an update until proven otherwise. */
+            if (*remote_timestamp != 0 && *remote_timestamp <= local_timestamp)
+              continue;
+          }
 
           g_ptr_array_add (updates, g_object_ref (installed_ref));
 
@@ -1102,18 +1103,19 @@ flatpak_installation_list_installed_refs_for_update (FlatpakInstallation *self,
  *
  * FIXME: If this were async, the parallelisation could be handled in the caller. */
 static gboolean
-list_remotes_for_configured_remote (FlatpakInstallation  *self,
-                                    const gchar          *remote_name,
-                                    FlatpakDir           *dir,
-                                    gboolean              types_filter[],
-                                    GPtrArray            *remotes  /* (element-type FlatpakRemote) */,
-                                    GCancellable         *cancellable,
-                                    GError              **error)
+list_remotes_for_configured_remote (FlatpakInstallation *self,
+                                    const gchar         *remote_name,
+                                    FlatpakDir          *dir,
+                                    gboolean             types_filter[],
+                                    GPtrArray           *remotes /* (element-type FlatpakRemote) */,
+                                    GCancellable        *cancellable,
+                                    GError             **error)
 {
   g_autofree gchar *collection_id = NULL;
   OstreeCollectionRef ref;
   const OstreeCollectionRef *refs[2] = { NULL, };
   g_autofree gchar *appstream_ref = NULL;
+
   g_auto(OstreeRepoFinderResultv) results = NULL;
   g_autoptr(GAsyncResult) result = NULL;
   g_autoptr(OstreeRepoFinder) finder_mount = NULL, finder_avahi = NULL;
@@ -1281,6 +1283,7 @@ flatpak_installation_list_remotes (FlatpakInstallation *self,
                                    GError             **error)
 {
   const FlatpakRemoteType types[] = { FLATPAK_REMOTE_TYPE_STATIC };
+
   return flatpak_installation_list_remotes_by_type (self, types, 1, cancellable, error);
 }
 
@@ -1375,10 +1378,10 @@ flatpak_installation_remove_remote (FlatpakInstallation *self,
  */
 gboolean
 flatpak_installation_set_config_sync (FlatpakInstallation *self,
-				      const char          *key,
-				      const char          *value,
-				      GCancellable        *cancellable,
-				      GError             **error)
+                                      const char          *key,
+                                      const char          *value,
+                                      GCancellable        *cancellable,
+                                      GError             **error)
 {
   g_autoptr(FlatpakDir) dir = NULL;
   g_autoptr(FlatpakDir) dir_clone = NULL;
@@ -1416,9 +1419,9 @@ flatpak_installation_set_config_sync (FlatpakInstallation *self,
  */
 char *
 flatpak_installation_get_config (FlatpakInstallation *self,
-				 const char          *key,
-				 GCancellable        *cancellable,
-				 GError             **error)
+                                 const char          *key,
+                                 GCancellable        *cancellable,
+                                 GError             **error)
 {
   g_autoptr(FlatpakDir) dir = NULL;
 
@@ -1749,7 +1752,7 @@ flatpak_installation_install_full (FlatpakInstallation    *self,
                             (flags & FLATPAK_INSTALL_FLAGS_NO_DEPLOY) != 0,
                             (flags & FLATPAK_INSTALL_FLAGS_NO_STATIC_DELTAS) != 0,
                             FALSE, state,
-                            ref, NULL, (const char **)subpaths,
+                            ref, NULL, (const char **) subpaths,
                             ostree_progress, cancellable, error))
     goto out;
 
@@ -1897,7 +1900,7 @@ flatpak_installation_update_full (FlatpakInstallation    *self,
     return NULL;
 
   target_commit = flatpak_dir_check_for_update (dir, state, ref, NULL,
-                                                (const char **)subpaths,
+                                                (const char **) subpaths,
                                                 (flags & FLATPAK_UPDATE_FLAGS_NO_PULL) != 0,
                                                 &check_results,
                                                 cancellable, error);
@@ -1924,7 +1927,7 @@ flatpak_installation_update_full (FlatpakInstallation    *self,
                            FALSE, state,
                            ref, target_commit,
                            (const OstreeRepoFinderResult * const *) check_results,
-                           (const char **)subpaths,
+                           (const char **) subpaths,
                            ostree_progress, cancellable, error))
     goto out;
 
@@ -2365,14 +2368,14 @@ flatpak_installation_update_appstream_sync (FlatpakInstallation *self,
  * Returns: %TRUE on success, or %FALSE on error
  */
 gboolean
-flatpak_installation_update_appstream_full_sync (FlatpakInstallation *self,
-                                                 const char          *remote_name,
-                                                 const char          *arch,
+flatpak_installation_update_appstream_full_sync (FlatpakInstallation    *self,
+                                                 const char             *remote_name,
+                                                 const char             *arch,
                                                  FlatpakProgressCallback progress,
                                                  gpointer                progress_data,
-                                                 gboolean            *out_changed,
-                                                 GCancellable        *cancellable,
-                                                 GError             **error)
+                                                 gboolean               *out_changed,
+                                                 GCancellable           *cancellable,
+                                                 GError                **error)
 {
   g_autoptr(FlatpakDir) dir = NULL;
   g_autoptr(FlatpakDir) dir_clone = NULL;
diff --git a/common/flatpak-installation.h b/common/flatpak-installation.h
index 3c47950e..a74b0478 100644
--- a/common/flatpak-installation.h
+++ b/common/flatpak-installation.h
@@ -200,11 +200,11 @@ FLATPAK_EXTERN FlatpakInstalledRef * flatpak_installation_get_current_installed_
 FLATPAK_EXTERN GPtrArray           *flatpak_installation_list_remotes (FlatpakInstallation *self,
                                                                        GCancellable        *cancellable,
                                                                        GError             **error);
-FLATPAK_EXTERN GPtrArray           *flatpak_installation_list_remotes_by_type (FlatpakInstallation     *self,
-                                                                               const FlatpakRemoteType  types[],
-                                                                               gsize                    num_types,
-                                                                               GCancellable            *cancellable,
-                                                                               GError                 **error);
+FLATPAK_EXTERN GPtrArray           *flatpak_installation_list_remotes_by_type (FlatpakInstallation    *self,
+                                                                               const FlatpakRemoteType types[],
+                                                                               gsize                   num_types,
+                                                                               GCancellable           *cancellable,
+                                                                               GError                **error);
 FLATPAK_EXTERN FlatpakRemote        *flatpak_installation_get_remote_by_name (FlatpakInstallation *self,
                                                                               const gchar         *name,
                                                                               GCancellable        *cancellable,
@@ -222,14 +222,14 @@ FLATPAK_EXTERN gboolean              flatpak_installation_update_remote_sync (Fl
                                                                               GCancellable        *cancellable,
                                                                               GError             **error);
 FLATPAK_EXTERN gboolean              flatpak_installation_set_config_sync (FlatpakInstallation *self,
-									   const char          *key,
-									   const char          *value,
-									   GCancellable        *cancellable,
-									   GError             **error);
-FLATPAK_EXTERN char *                flatpak_installation_get_config      (FlatpakInstallation *self,
-									   const char          *key,
-									   GCancellable        *cancellable,
-									   GError             **error);
+                                                                           const char          *key,
+                                                                           const char          *value,
+                                                                           GCancellable        *cancellable,
+                                                                           GError             **error);
+FLATPAK_EXTERN char *                flatpak_installation_get_config (FlatpakInstallation *self,
+                                                                      const char          *key,
+                                                                      GCancellable        *cancellable,
+                                                                      GError             **error);
 FLATPAK_EXTERN char *              flatpak_installation_load_app_overrides (FlatpakInstallation *self,
                                                                             const char          *app_id,
                                                                             GCancellable        *cancellable,
@@ -338,14 +338,14 @@ FLATPAK_EXTERN gboolean          flatpak_installation_update_appstream_sync (Fla
                                                                              gboolean            *out_changed,
                                                                              GCancellable        *cancellable,
                                                                              GError             **error);
-FLATPAK_EXTERN gboolean          flatpak_installation_update_appstream_full_sync (FlatpakInstallation *self,
-                                                                                  const char          *remote_name,
-                                                                                  const char          *arch,
+FLATPAK_EXTERN gboolean          flatpak_installation_update_appstream_full_sync (FlatpakInstallation    *self,
+                                                                                  const char             *remote_name,
+                                                                                  const char             *arch,
                                                                                   FlatpakProgressCallback progress,
                                                                                   gpointer                progress_data,
-                                                                                  gboolean            *out_changed,
-                                                                                  GCancellable        *cancellable,
-                                                                                  GError             **error);
+                                                                                  gboolean               *out_changed,
+                                                                                  GCancellable           *cancellable,
+                                                                                  GError                **error);
 FLATPAK_EXTERN GPtrArray    *    flatpak_installation_list_remote_related_refs_sync (FlatpakInstallation *self,
                                                                                      const char          *remote_name,
                                                                                      const char          *ref,
@@ -361,13 +361,13 @@ FLATPAK_EXTERN gboolean          flatpak_installation_remove_local_ref_sync (Fla
                                                                              const char          *remote_name,
                                                                              const char          *ref,
                                                                              GCancellable        *cancellable,
-                                                                             GError              **error);
+                                                                             GError             **error);
 FLATPAK_EXTERN gboolean          flatpak_installation_cleanup_local_refs_sync (FlatpakInstallation *self,
                                                                                GCancellable        *cancellable,
-                                                                               GError              **error);
+                                                                               GError             **error);
 FLATPAK_EXTERN gboolean          flatpak_installation_prune_local_repo (FlatpakInstallation *self,
                                                                         GCancellable        *cancellable,
-                                                                        GError              **error);
+                                                                        GError             **error);
 
 
 #endif /* __FLATPAK_INSTALLATION_H__ */
diff --git a/common/flatpak-installed-ref.c b/common/flatpak-installed-ref.c
index 1b228c59..14ab3e1e 100644
--- a/common/flatpak-installed-ref.c
+++ b/common/flatpak-installed-ref.c
@@ -180,7 +180,7 @@ flatpak_installed_ref_get_property (GObject    *object,
       g_value_set_string (value, priv->eol_rebase);
       break;
 
-   default:
+    default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     }
@@ -243,14 +243,14 @@ flatpak_installed_ref_class_init (FlatpakInstalledRefClass *klass)
                                                         "End of life",
                                                         "The reason for the ref to be end of life",
                                                         NULL,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_EOL_REBASE,
                                    g_param_spec_string ("end-of-life-rebase",
                                                         "End of life rebase",
                                                         "The new ref for the end of lifeed ref",
                                                         NULL,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/common/flatpak-json-oci-private.h b/common/flatpak-json-oci-private.h
index dbe16ad9..6afc958b 100644
--- a/common/flatpak-json-oci-private.h
+++ b/common/flatpak-json-oci-private.h
@@ -40,17 +40,18 @@ void flatpak_oci_export_annotations (GHashTable *source,
 void flatpak_oci_copy_annotations (GHashTable *source,
                                    GHashTable *dest);
 
-typedef struct {
-  char *mediatype;
-  char *digest;
-  gint64 size;
-  char **urls;
+typedef struct
+{
+  char       *mediatype;
+  char       *digest;
+  gint64      size;
+  char      **urls;
   GHashTable *annotations;
 } FlatpakOciDescriptor;
 
 FlatpakOciDescriptor *flatpak_oci_descriptor_new (const char *mediatype,
                                                   const char *digest,
-                                                  gint64 size);
+                                                  gint64      size);
 void flatpak_oci_descriptor_copy (FlatpakOciDescriptor *source,
                                   FlatpakOciDescriptor *dest);
 void flatpak_oci_descriptor_destroy (FlatpakOciDescriptor *self);
@@ -60,17 +61,17 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakOciDescriptor, flatpak_oci_descriptor_free
 
 typedef struct
 {
-  char *architecture;
-  char *os;
-  char *os_version;
+  char  *architecture;
+  char  *os;
+  char  *os_version;
   char **os_features;
-  char *variant;
+  char  *variant;
   char **features;
 } FlatpakOciManifestPlatform;
 
 typedef struct
 {
-  FlatpakOciDescriptor parent;
+  FlatpakOciDescriptor       parent;
   FlatpakOciManifestPlatform platform;
 } FlatpakOciManifestDescriptor;
 
@@ -83,32 +84,34 @@ void flatpak_oci_manifest_descriptor_free (FlatpakOciManifestDescriptor *self);
 #define FLATPAK_TYPE_OCI_VERSIONED flatpak_oci_versioned_get_type ()
 G_DECLARE_FINAL_TYPE (FlatpakOciVersioned, flatpak_oci_versioned, FLATPAK_OCI, VERSIONED, FlatpakJson)
 
-struct _FlatpakOciVersioned {
+struct _FlatpakOciVersioned
+{
   FlatpakJson parent;
 
-  int version;
-  char *mediatype;
+  int         version;
+  char       *mediatype;
 };
 
-struct _FlatpakOciVersionedClass {
+struct _FlatpakOciVersionedClass
+{
   FlatpakJsonClass parent_class;
 };
 
-FlatpakOciVersioned *flatpak_oci_versioned_from_json     (GBytes               *bytes,
-                                                          GError              **error);
-const char *         flatpak_oci_versioned_get_mediatype (FlatpakOciVersioned  *self);
-gint64               flatpak_oci_versioned_get_version   (FlatpakOciVersioned  *self);
+FlatpakOciVersioned *flatpak_oci_versioned_from_json (GBytes  *bytes,
+                                                      GError **error);
+const char *         flatpak_oci_versioned_get_mediatype (FlatpakOciVersioned *self);
+gint64               flatpak_oci_versioned_get_version (FlatpakOciVersioned *self);
 
 #define FLATPAK_TYPE_OCI_MANIFEST flatpak_oci_manifest_get_type ()
 G_DECLARE_FINAL_TYPE (FlatpakOciManifest, flatpak_oci_manifest, FLATPAK, OCI_MANIFEST, FlatpakOciVersioned)
 
 struct _FlatpakOciManifest
 {
-  FlatpakOciVersioned parent;
+  FlatpakOciVersioned    parent;
 
-  FlatpakOciDescriptor config;
+  FlatpakOciDescriptor   config;
   FlatpakOciDescriptor **layers;
-  GHashTable     *annotations;
+  GHashTable            *annotations;
 };
 
 struct _FlatpakOciManifestClass
@@ -117,27 +120,27 @@ struct _FlatpakOciManifestClass
 };
 
 
-FlatpakOciManifest *flatpak_oci_manifest_new              (void);
-void                flatpak_oci_manifest_set_config       (FlatpakOciManifest  *self,
-                                                           FlatpakOciDescriptor *desc);
-void                flatpak_oci_manifest_set_layers       (FlatpakOciManifest  *self,
-                                                           FlatpakOciDescriptor **descs);
-void                flatpak_oci_manifest_set_layer        (FlatpakOciManifest  *self,
-                                                           FlatpakOciDescriptor *desc);
-int                 flatpak_oci_manifest_get_n_layers     (FlatpakOciManifest  *self);
-const char *        flatpak_oci_manifest_get_layer_digest (FlatpakOciManifest  *self,
-                                                           int                  i);
-GHashTable *        flatpak_oci_manifest_get_annotations  (FlatpakOciManifest  *self);
+FlatpakOciManifest *flatpak_oci_manifest_new (void);
+void                flatpak_oci_manifest_set_config (FlatpakOciManifest   *self,
+                                                     FlatpakOciDescriptor *desc);
+void                flatpak_oci_manifest_set_layers (FlatpakOciManifest    *self,
+                                                     FlatpakOciDescriptor **descs);
+void                flatpak_oci_manifest_set_layer (FlatpakOciManifest   *self,
+                                                    FlatpakOciDescriptor *desc);
+int                 flatpak_oci_manifest_get_n_layers (FlatpakOciManifest *self);
+const char *        flatpak_oci_manifest_get_layer_digest (FlatpakOciManifest *self,
+                                                           int                 i);
+GHashTable *        flatpak_oci_manifest_get_annotations (FlatpakOciManifest *self);
 
 #define FLATPAK_TYPE_OCI_INDEX flatpak_oci_index_get_type ()
 G_DECLARE_FINAL_TYPE (FlatpakOciIndex, flatpak_oci_index, FLATPAK, OCI_INDEX, FlatpakOciVersioned)
 
 struct _FlatpakOciIndex
 {
-  FlatpakOciVersioned parent;
+  FlatpakOciVersioned            parent;
 
   FlatpakOciManifestDescriptor **manifests;
-  GHashTable     *annotations;
+  GHashTable                    *annotations;
 };
 
 struct _FlatpakOciIndexClass
@@ -145,13 +148,13 @@ struct _FlatpakOciIndexClass
   FlatpakOciVersionedClass parent_class;
 };
 
-FlatpakOciIndex *             flatpak_oci_index_new             (void);
-void                          flatpak_oci_index_add_manifest    (FlatpakOciIndex *self,
-                                                                 FlatpakOciDescriptor *desc);
+FlatpakOciIndex *             flatpak_oci_index_new (void);
+void                          flatpak_oci_index_add_manifest (FlatpakOciIndex      *self,
+                                                              FlatpakOciDescriptor *desc);
 gboolean                      flatpak_oci_index_remove_manifest (FlatpakOciIndex *self,
                                                                  const char      *ref);
-FlatpakOciManifestDescriptor *flatpak_oci_index_get_manifest    (FlatpakOciIndex *self,
-                                                                 const char      *ref);
+FlatpakOciManifestDescriptor *flatpak_oci_index_get_manifest (FlatpakOciIndex *self,
+                                                              const char      *ref);
 FlatpakOciManifestDescriptor *flatpak_oci_index_get_only_manifest (FlatpakOciIndex *self);
 int                           flatpak_oci_index_get_n_manifests (FlatpakOciIndex *self);
 
@@ -160,44 +163,44 @@ G_DECLARE_FINAL_TYPE (FlatpakOciImage, flatpak_oci_image, FLATPAK, OCI_IMAGE, Fl
 
 typedef struct
 {
-  char *type;
+  char  *type;
   char **diff_ids;
 } FlatpakOciImageRootfs;
 
 typedef struct
 {
-  char *user;
-  char *working_dir;
-  gint64 memory;
-  gint64 memory_swap;
-  gint64 cpu_shares;
-  char **env;
-  char **cmd;
-  char **entrypoint;
-  char **exposed_ports;
-  char **volumes;
+  char       *user;
+  char       *working_dir;
+  gint64      memory;
+  gint64      memory_swap;
+  gint64      cpu_shares;
+  char      **env;
+  char      **cmd;
+  char      **entrypoint;
+  char      **exposed_ports;
+  char      **volumes;
   GHashTable *labels;
 } FlatpakOciImageConfig;
 
 typedef struct
 {
-  char *created;
-  char *created_by;
-  char *author;
-  char *comment;
+  char    *created;
+  char    *created_by;
+  char    *author;
+  char    *comment;
   gboolean empty_layer;
 } FlatpakOciImageHistory;
 
 struct _FlatpakOciImage
 {
-  FlatpakJson parent;
-
-  char *created;
-  char *author;
-  char *architecture;
-  char *os;
-  FlatpakOciImageRootfs rootfs;
-  FlatpakOciImageConfig config;
+  FlatpakJson              parent;
+
+  char                    *created;
+  char                    *author;
+  char                    *architecture;
+  char                    *os;
+  FlatpakOciImageRootfs    rootfs;
+  FlatpakOciImageConfig    config;
   FlatpakOciImageHistory **history;
 };
 
@@ -206,30 +209,30 @@ struct _FlatpakOciImageClass
   FlatpakJsonClass parent_class;
 };
 
-FlatpakOciImage *flatpak_oci_image_new              (void);
-void             flatpak_oci_image_set_created      (FlatpakOciImage  *image,
-                                                     const char       *created);
-void             flatpak_oci_image_set_architecture (FlatpakOciImage  *image,
-                                                     const char       *arch);
-void             flatpak_oci_image_set_os           (FlatpakOciImage  *image,
-                                                     const char       *os);
-void             flatpak_oci_image_set_layers       (FlatpakOciImage  *image,
-                                                     const char      **layers);
-void             flatpak_oci_image_set_layer        (FlatpakOciImage  *image,
-                                                     const char       *layer);
-
-void flatpak_oci_add_annotations_for_commit (GHashTable       *annotations,
-                                             const char       *ref,
-                                             const char       *commit,
-                                             GVariant         *commit_data);
-void flatpak_oci_parse_commit_annotations  (GHashTable       *annotations,
-                                            guint64          *out_timestamp,
-                                            char            **out_subject,
-                                            char            **out_body,
-                                            char            **out_ref,
-                                            char            **out_commit,
-                                            char            **out_parent_commit,
-                                            GVariantBuilder  *metadata_builder);
+FlatpakOciImage *flatpak_oci_image_new (void);
+void             flatpak_oci_image_set_created (FlatpakOciImage *image,
+                                                const char      *created);
+void             flatpak_oci_image_set_architecture (FlatpakOciImage *image,
+                                                     const char      *arch);
+void             flatpak_oci_image_set_os (FlatpakOciImage *image,
+                                           const char      *os);
+void             flatpak_oci_image_set_layers (FlatpakOciImage *image,
+                                               const char     **layers);
+void             flatpak_oci_image_set_layer (FlatpakOciImage *image,
+                                              const char      *layer);
+
+void flatpak_oci_add_annotations_for_commit (GHashTable *annotations,
+                                             const char *ref,
+                                             const char *commit,
+                                             GVariant   *commit_data);
+void flatpak_oci_parse_commit_annotations (GHashTable      *annotations,
+                                           guint64         *out_timestamp,
+                                           char           **out_subject,
+                                           char           **out_body,
+                                           char           **out_ref,
+                                           char           **out_commit,
+                                           char           **out_parent_commit,
+                                           GVariantBuilder *metadata_builder);
 
 #define FLATPAK_TYPE_OCI_SIGNATURE flatpak_oci_signature_get_type ()
 G_DECLARE_FINAL_TYPE (FlatpakOciSignature, flatpak_oci_signature, FLATPAK, OCI_SIGNATURE, FlatpakJson)
@@ -246,20 +249,20 @@ typedef struct
 
 typedef struct
 {
-  char *type;
-  FlatpakOciSignatureCriticalImage image;
+  char                               *type;
+  FlatpakOciSignatureCriticalImage    image;
   FlatpakOciSignatureCriticalIdentity identity;
 } FlatpakOciSignatureCritical;
 
 typedef struct
 {
-  char *creator;
+  char  *creator;
   gint64 timestamp;
 } FlatpakOciSignatureOptional;
 
 struct _FlatpakOciSignature
 {
-  FlatpakJson parent;
+  FlatpakJson                 parent;
 
   FlatpakOciSignatureCritical critical;
   FlatpakOciSignatureOptional optional;
@@ -270,7 +273,8 @@ struct _FlatpakOciSignatureClass
   FlatpakJsonClass parent_class;
 };
 
-FlatpakOciSignature *flatpak_oci_signature_new (const char *digest, const char *ref);
+FlatpakOciSignature *flatpak_oci_signature_new (const char *digest,
+                                                const char *ref);
 
 
 #define FLATPAK_TYPE_OCI_INDEX_RESPONSE flatpak_oci_index_response_get_type ()
@@ -278,35 +282,35 @@ G_DECLARE_FINAL_TYPE (FlatpakOciIndexResponse, flatpak_oci_index_response, FLATP
 
 typedef struct
 {
-  char *digest;
-  char *mediatype;
-  char *os;
-  char *architecture;
+  char       *digest;
+  char       *mediatype;
+  char       *os;
+  char       *architecture;
   GHashTable *annotations;
   GHashTable *labels;
-  char **tags;
+  char      **tags;
 } FlatpakOciIndexImage;
 
 typedef struct
 {
-  char *digest;
-  char *mediatype;
-  char **tags;
+  char                  *digest;
+  char                  *mediatype;
+  char                 **tags;
   FlatpakOciIndexImage **images;
 } FlatpakOciIndexImageList;
 
 typedef struct
 {
-  char *name;
-  FlatpakOciIndexImage **images;
+  char                      *name;
+  FlatpakOciIndexImage     **images;
   FlatpakOciIndexImageList **lists;
 } FlatpakOciIndexRepository;
 
 struct _FlatpakOciIndexResponse
 {
-  FlatpakJson parent;
+  FlatpakJson                 parent;
 
-  char *registry;
+  char                       *registry;
   FlatpakOciIndexRepository **results;
 };
 
diff --git a/common/flatpak-json-oci.c b/common/flatpak-json-oci.c
index c0212320..483fdd3c 100644
--- a/common/flatpak-json-oci.c
+++ b/common/flatpak-json-oci.c
@@ -40,7 +40,7 @@ flatpak_arch_to_oci_arch (const char *flatpak_arch)
 FlatpakOciDescriptor *
 flatpak_oci_descriptor_new (const char *mediatype,
                             const char *digest,
-                            gint64 size)
+                            gint64      size)
 {
   FlatpakOciDescriptor *desc = g_new0 (FlatpakOciDescriptor, 1);
 
@@ -61,7 +61,7 @@ flatpak_oci_descriptor_copy (FlatpakOciDescriptor *source,
   dest->mediatype = g_strdup (source->mediatype);
   dest->digest = g_strdup (source->digest);
   dest->size = source->size;
-  dest->urls = g_strdupv ((char **)source->urls);
+  dest->urls = g_strdupv ((char **) source->urls);
   dest->annotations = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
   if (source->annotations)
     flatpak_oci_copy_annotations (source->annotations, dest->annotations);
@@ -89,7 +89,7 @@ static FlatpakJsonProp flatpak_oci_descriptor_props[] = {
   FLATPAK_JSON_STRING_PROP (FlatpakOciDescriptor, digest, "digest"),
   FLATPAK_JSON_INT64_PROP (FlatpakOciDescriptor, size, "size"),
   FLATPAK_JSON_STRV_PROP (FlatpakOciDescriptor, urls, "urls"),
-  FLATPAK_JSON_STRMAP_PROP(FlatpakOciDescriptor, annotations, "annotations"),
+  FLATPAK_JSON_STRMAP_PROP (FlatpakOciDescriptor, annotations, "annotations"),
   FLATPAK_JSON_LAST_PROP
 };
 
@@ -245,9 +245,9 @@ flatpak_oci_manifest_class_init (FlatpakOciManifestClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   FlatpakJsonClass *json_class = FLATPAK_JSON_CLASS (klass);
   static FlatpakJsonProp props[] = {
-    FLATPAK_JSON_STRUCT_PROP(FlatpakOciManifest, config, "config", flatpak_oci_descriptor_props),
-    FLATPAK_JSON_STRUCTV_PROP(FlatpakOciManifest, layers, "layers", flatpak_oci_descriptor_props),
-    FLATPAK_JSON_STRMAP_PROP(FlatpakOciManifest, annotations, "annotations"),
+    FLATPAK_JSON_STRUCT_PROP (FlatpakOciManifest, config, "config", flatpak_oci_descriptor_props),
+    FLATPAK_JSON_STRUCTV_PROP (FlatpakOciManifest, layers, "layers", flatpak_oci_descriptor_props),
+    FLATPAK_JSON_STRMAP_PROP (FlatpakOciManifest, annotations, "annotations"),
     FLATPAK_JSON_LAST_PROP
   };
 
@@ -276,7 +276,7 @@ flatpak_oci_manifest_new (void)
 }
 
 void
-flatpak_oci_manifest_set_config (FlatpakOciManifest *self,
+flatpak_oci_manifest_set_config (FlatpakOciManifest   *self,
                                  FlatpakOciDescriptor *desc)
 {
   g_free (self->config.mediatype);
@@ -298,15 +298,16 @@ ptrv_count (gpointer *ptrs)
 }
 
 void
-flatpak_oci_manifest_set_layer (FlatpakOciManifest  *self,
+flatpak_oci_manifest_set_layer (FlatpakOciManifest   *self,
                                 FlatpakOciDescriptor *desc)
 {
   FlatpakOciDescriptor *descs[2] = { desc, NULL };
+
   flatpak_oci_manifest_set_layers (self, descs);
 }
 
 void
-flatpak_oci_manifest_set_layers (FlatpakOciManifest *self,
+flatpak_oci_manifest_set_layers (FlatpakOciManifest    *self,
                                  FlatpakOciDescriptor **descs)
 {
   int i, count;
@@ -315,7 +316,7 @@ flatpak_oci_manifest_set_layers (FlatpakOciManifest *self,
     flatpak_oci_descriptor_free (self->layers[i]);
   g_free (self->layers);
 
-  count = ptrv_count ((gpointer *)descs);
+  count = ptrv_count ((gpointer *) descs);
 
   self->layers = g_new0 (FlatpakOciDescriptor *, count + 1);
   for (i = 0; i < count; i++)
@@ -330,12 +331,12 @@ flatpak_oci_manifest_set_layers (FlatpakOciManifest *self,
 int
 flatpak_oci_manifest_get_n_layers (FlatpakOciManifest *self)
 {
-  return ptrv_count ((gpointer *)self->layers);
+  return ptrv_count ((gpointer *) self->layers);
 }
 
 const char *
 flatpak_oci_manifest_get_layer_digest (FlatpakOciManifest *self,
-                                      int i)
+                                       int                 i)
 {
   return self->layers[i]->digest;
 }
@@ -371,8 +372,8 @@ flatpak_oci_index_class_init (FlatpakOciIndexClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   FlatpakJsonClass *json_class = FLATPAK_JSON_CLASS (klass);
   static FlatpakJsonProp props[] = {
-    FLATPAK_JSON_STRUCTV_PROP(FlatpakOciIndex, manifests, "manifests", flatpak_oci_manifest_descriptor_props),
-    FLATPAK_JSON_STRMAP_PROP(FlatpakOciIndex, annotations, "annotations"),
+    FLATPAK_JSON_STRUCTV_PROP (FlatpakOciIndex, manifests, "manifests", flatpak_oci_manifest_descriptor_props),
+    FLATPAK_JSON_STRMAP_PROP (FlatpakOciIndex, annotations, "annotations"),
     FLATPAK_JSON_LAST_PROP
   };
 
@@ -409,19 +410,19 @@ manifest_desc_for_desc (FlatpakOciDescriptor *src_descriptor, const char *ref)
   flatpak_oci_descriptor_copy (src_descriptor, &desc->parent);
 
   g_hash_table_replace (desc->parent.annotations,
-			g_strdup ("org.opencontainers.image.ref.name"),
-			g_strdup (ref));
+                        g_strdup ("org.opencontainers.image.ref.name"),
+                        g_strdup (ref));
   return desc;
 }
 
 int
 flatpak_oci_index_get_n_manifests (FlatpakOciIndex *self)
 {
-  return ptrv_count ((gpointer *)self->manifests);
+  return ptrv_count ((gpointer *) self->manifests);
 }
 
 void
-flatpak_oci_index_add_manifest (FlatpakOciIndex *self,
+flatpak_oci_index_add_manifest (FlatpakOciIndex      *self,
                                 FlatpakOciDescriptor *desc)
 {
   FlatpakOciManifestDescriptor *m;
@@ -439,7 +440,7 @@ flatpak_oci_index_add_manifest (FlatpakOciIndex *self,
   m = manifest_desc_for_desc (desc, m_ref);
   self->manifests = g_renew (FlatpakOciManifestDescriptor *, self->manifests, count + 2);
   self->manifests[count] = m;
-  self->manifests[count+1] = NULL;
+  self->manifests[count + 1] = NULL;
 }
 
 const char *
@@ -457,7 +458,7 @@ flatpak_oci_manifest_descriptor_get_ref (FlatpakOciManifestDescriptor *m)
 
 static int
 index_find_ref (FlatpakOciIndex *self,
-                const char *ref)
+                const char      *ref)
 {
   int i;
 
@@ -480,7 +481,7 @@ index_find_ref (FlatpakOciIndex *self,
 
 FlatpakOciManifestDescriptor *
 flatpak_oci_index_get_manifest (FlatpakOciIndex *self,
-                                const char *ref)
+                                const char      *ref)
 {
   int i = index_find_ref (self, ref);
 
@@ -527,7 +528,7 @@ flatpak_oci_index_remove_manifest (FlatpakOciIndex *self,
     return FALSE;
 
   for (; self->manifests[i] != NULL; i++)
-    self->manifests[i] = self->manifests[i+1];
+    self->manifests[i] = self->manifests[i + 1];
 
   return TRUE;
 }
@@ -601,7 +602,7 @@ flatpak_oci_image_class_init (FlatpakOciImageClass *klass)
     FLATPAK_JSON_STRV_PROP (FlatpakOciImageConfig, cmd, "Cmd"),
     FLATPAK_JSON_BOOLMAP_PROP (FlatpakOciImageConfig, volumes, "Volumes"),
     FLATPAK_JSON_STRING_PROP (FlatpakOciImageConfig, working_dir, "WorkingDir"),
-    FLATPAK_JSON_STRMAP_PROP(FlatpakOciImageConfig, labels, "Labels"),
+    FLATPAK_JSON_STRMAP_PROP (FlatpakOciImageConfig, labels, "Labels"),
     FLATPAK_JSON_LAST_PROP
   };
   static FlatpakJsonProp rootfs_props[] = {
@@ -662,7 +663,7 @@ flatpak_oci_image_new (void)
 
 void
 flatpak_oci_image_set_created (FlatpakOciImage *image,
-                              const char *created)
+                               const char      *created)
 {
   g_free (image->created);
   image->created = g_strdup (created);
@@ -670,7 +671,7 @@ flatpak_oci_image_set_created (FlatpakOciImage *image,
 
 void
 flatpak_oci_image_set_architecture (FlatpakOciImage *image,
-                                   const char *arch)
+                                    const char      *arch)
 {
   g_free (image->architecture);
   image->architecture = g_strdup (arch);
@@ -678,7 +679,7 @@ flatpak_oci_image_set_architecture (FlatpakOciImage *image,
 
 void
 flatpak_oci_image_set_os (FlatpakOciImage *image,
-                         const char *os)
+                          const char      *os)
 {
   g_free (image->os);
   image->os = g_strdup (os);
@@ -686,15 +687,15 @@ flatpak_oci_image_set_os (FlatpakOciImage *image,
 
 void
 flatpak_oci_image_set_layers (FlatpakOciImage *image,
-                             const char **layers)
+                              const char     **layers)
 {
   g_strfreev (image->rootfs.diff_ids);
-  image->rootfs.diff_ids = g_strdupv ((char **)layers);
+  image->rootfs.diff_ids = g_strdupv ((char **) layers);
 }
 
 void
 flatpak_oci_image_set_layer (FlatpakOciImage *image,
-                             const char *layer)
+                             const char      *layer)
 {
   const char *layers[] = {layer, NULL};
 
@@ -728,35 +729,35 @@ void
 flatpak_oci_copy_annotations (GHashTable *source,
                               GHashTable *dest)
 {
- GHashTableIter iter;
- gpointer key, value;
+  GHashTableIter iter;
+  gpointer key, value;
 
- g_hash_table_iter_init (&iter, source);
- while (g_hash_table_iter_next (&iter, &key, &value))
-   g_hash_table_replace (dest,
-                         g_strdup ((char *)key),
-                         g_strdup ((char *)value));
+  g_hash_table_iter_init (&iter, source);
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    g_hash_table_replace (dest,
+                          g_strdup ((char *) key),
+                          g_strdup ((char *) value));
 }
 
 static void
 add_annotation (GHashTable *annotations, const char *key, const char *value)
 {
-    g_hash_table_replace (annotations,
-                          g_strdup (key),
-                          g_strdup (value));
+  g_hash_table_replace (annotations,
+                        g_strdup (key),
+                        g_strdup (value));
 }
 
 void
 flatpak_oci_add_annotations_for_commit (GHashTable *annotations,
-                                       const char *ref,
-                                       const char *commit,
-                                       GVariant *commit_data)
+                                        const char *ref,
+                                        const char *commit,
+                                        GVariant   *commit_data)
 {
   if (ref)
-    add_annotation (annotations,"org.flatpak.ref", ref);
+    add_annotation (annotations, "org.flatpak.ref", ref);
 
   if (commit)
-    add_annotation (annotations,"org.flatpak.commit", commit);
+    add_annotation (annotations, "org.flatpak.commit", commit);
 
   if (commit_data)
     {
@@ -795,17 +796,17 @@ flatpak_oci_add_annotations_for_commit (GHashTable *annotations,
 
       g_variant_get_child (commit_data, 4, "s", &body);
       add_annotation (annotations, "org.flatpak.body", body);
-   }
+    }
 }
 
 void
-flatpak_oci_parse_commit_annotations (GHashTable *annotations,
-                                      guint64 *out_timestamp,
-                                      char **out_subject,
-                                      char **out_body,
-                                      char **out_ref,
-                                      char **out_commit,
-                                      char **out_parent_commit,
+flatpak_oci_parse_commit_annotations (GHashTable      *annotations,
+                                      guint64         *out_timestamp,
+                                      char           **out_subject,
+                                      char           **out_body,
+                                      char           **out_ref,
+                                      char           **out_commit,
+                                      char           **out_parent_commit,
                                       GVariantBuilder *metadata_builder)
 {
   const char *oci_timestamp, *oci_subject, *oci_body, *oci_parent_commit, *oci_commit, *oci_ref;
@@ -852,7 +853,7 @@ flatpak_oci_parse_commit_annotations (GHashTable *annotations,
           key += strlen ("org.flatpak.commit-metadata.");
 
           bin = g_base64_decode (value, &bin_len);
-          data = g_variant_ref_sink (g_variant_new_from_data (G_VARIANT_TYPE("v"), bin, bin_len, FALSE,
+          data = g_variant_ref_sink (g_variant_new_from_data (G_VARIANT_TYPE ("v"), bin, bin_len, FALSE,
                                                               g_free, bin));
           g_variant_builder_add (metadata_builder, "{s@v}", key, data);
         }
@@ -902,8 +903,8 @@ flatpak_oci_signature_class_init (FlatpakOciSignatureClass *klass)
   };
   static FlatpakJsonProp critical_props[] = {
     FLATPAK_JSON_MANDATORY_STRING_PROP (FlatpakOciSignatureCritical, type, "type"),
-    FLATPAK_JSON_MANDATORY_STRICT_STRUCT_PROP(FlatpakOciSignatureCritical, image, "image", image_props),
-    FLATPAK_JSON_MANDATORY_STRICT_STRUCT_PROP(FlatpakOciSignatureCritical, identity, "identity", identity_props),
+    FLATPAK_JSON_MANDATORY_STRICT_STRUCT_PROP (FlatpakOciSignatureCritical, image, "image", image_props),
+    FLATPAK_JSON_MANDATORY_STRICT_STRUCT_PROP (FlatpakOciSignatureCritical, identity, "identity", identity_props),
     FLATPAK_JSON_LAST_PROP
   };
   static FlatpakJsonProp optional_props[] = {
@@ -1015,8 +1016,8 @@ flatpak_oci_index_response_class_init (FlatpakOciIndexResponseClass *klass)
     FLATPAK_JSON_STRING_PROP (FlatpakOciIndexImage, mediatype, "MediaType"),
     FLATPAK_JSON_STRING_PROP (FlatpakOciIndexImage, os, "OS"),
     FLATPAK_JSON_STRING_PROP (FlatpakOciIndexImage, architecture, "Architecture"),
-    FLATPAK_JSON_STRMAP_PROP(FlatpakOciIndexImage, annotations, "Annotations"),
-    FLATPAK_JSON_STRMAP_PROP(FlatpakOciIndexImage, labels, "Labels"),
+    FLATPAK_JSON_STRMAP_PROP (FlatpakOciIndexImage, annotations, "Annotations"),
+    FLATPAK_JSON_STRMAP_PROP (FlatpakOciIndexImage, labels, "Labels"),
     FLATPAK_JSON_STRV_PROP (FlatpakOciIndexImage, tags, "Tags"),
     FLATPAK_JSON_LAST_PROP
   };
diff --git a/common/flatpak-json-private.h b/common/flatpak-json-private.h
index 719929df..e9e9b5f5 100644
--- a/common/flatpak-json-private.h
+++ b/common/flatpak-json-private.h
@@ -43,20 +43,21 @@ typedef enum {
 
 typedef enum {
   FLATPAK_JSON_PROP_FLAGS_NONE = 0,
-  FLATPAK_JSON_PROP_FLAGS_OPTIONAL = 1<<0,
-  FLATPAK_JSON_PROP_FLAGS_STRICT = 1<<1,
-  FLATPAK_JSON_PROP_FLAGS_MANDATORY = 1<<2,
+  FLATPAK_JSON_PROP_FLAGS_OPTIONAL = 1 << 0,
+  FLATPAK_JSON_PROP_FLAGS_STRICT = 1 << 1,
+  FLATPAK_JSON_PROP_FLAGS_MANDATORY = 1 << 2,
 } FlatpakJsonPropFlags;
 
 
-struct _FlatpakJsonProp {
-  const char *name;
-  gsize offset;
-  FlatpakJsonPropType type;
-  gpointer type_data;
-  gpointer type_data2;
+struct _FlatpakJsonProp
+{
+  const char          *name;
+  gsize                offset;
+  FlatpakJsonPropType  type;
+  gpointer             type_data;
+  gpointer             type_data2;
   FlatpakJsonPropFlags flags;
-} ;
+};
 
 #define FLATPAK_JSON_STRING_PROP(_struct, _field, _name) \
   { _name, G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_STRING }
@@ -73,36 +74,37 @@ struct _FlatpakJsonProp {
 #define FLATPAK_JSON_BOOLMAP_PROP(_struct, _field, _name) \
   { _name, G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_BOOLMAP }
 #define FLATPAK_JSON_STRUCT_PROP(_struct, _field, _name, _props) \
-  { _name, G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_STRUCT, (gpointer)_props}
+  { _name, G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_STRUCT, (gpointer) _props}
 #define FLATPAK_JSON_OPT_STRUCT_PROP(_struct, _field, _name, _props) \
-  { _name, G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_STRUCT, (gpointer)_props, 0, FLATPAK_JSON_PROP_FLAGS_OPTIONAL}
+  { _name, G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_STRUCT, (gpointer) _props, 0, FLATPAK_JSON_PROP_FLAGS_OPTIONAL}
 #define FLATPAK_JSON_STRICT_STRUCT_PROP(_struct, _field, _name, _props) \
-  { _name, G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_STRUCT, (gpointer)_props, 0, FLATPAK_JSON_PROP_FLAGS_STRICT}
+  { _name, G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_STRUCT, (gpointer) _props, 0, FLATPAK_JSON_PROP_FLAGS_STRICT}
 #define FLATPAK_JSON_MANDATORY_STRICT_STRUCT_PROP(_struct, _field, _name, _props) \
-  { _name, G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_STRUCT, (gpointer)_props, 0, FLATPAK_JSON_PROP_FLAGS_STRICT | FLATPAK_JSON_PROP_FLAGS_MANDATORY}
+  { _name, G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_STRUCT, (gpointer) _props, 0, FLATPAK_JSON_PROP_FLAGS_STRICT | FLATPAK_JSON_PROP_FLAGS_MANDATORY}
 #define FLATPAK_JSON_PARENT_PROP(_struct, _field, _props) \
-  { "parent", G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_PARENT, (gpointer)_props}
+  { "parent", G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_PARENT, (gpointer) _props}
 #define FLATPAK_JSON_STRUCTV_PROP(_struct, _field, _name, _props) \
-  { _name, G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_STRUCTV, (gpointer)_props, (gpointer) sizeof (**((_struct *) 0)->_field) }
+  { _name, G_STRUCT_OFFSET (_struct, _field), FLATPAK_JSON_PROP_TYPE_STRUCTV, (gpointer) _props, (gpointer) sizeof (**((_struct *) 0)->_field) }
 #define FLATPAK_JSON_LAST_PROP { NULL }
 
 G_DECLARE_DERIVABLE_TYPE (FlatpakJson, flatpak_json, FLATPAK, JSON, GObject)
 
-struct _FlatpakJsonClass {
-  GObjectClass parent_class;
+struct _FlatpakJsonClass
+{
+  GObjectClass     parent_class;
 
   FlatpakJsonProp *props;
-  const char *mediatype;
+  const char      *mediatype;
 };
 
-FlatpakJson *flatpak_json_from_node (JsonNode       *node,
-                                     GType           type,
-                                     GError        **error);
-JsonNode   *flatpak_json_to_node   (FlatpakJson  *self);
-FlatpakJson *flatpak_json_from_bytes (GBytes         *bytes,
-                                      GType           type,
-                                      GError        **error);
-GBytes     *flatpak_json_to_bytes  (FlatpakJson  *self);
+FlatpakJson *flatpak_json_from_node (JsonNode *node,
+                                     GType     type,
+                                     GError  **error);
+JsonNode   *flatpak_json_to_node (FlatpakJson *self);
+FlatpakJson *flatpak_json_from_bytes (GBytes  *bytes,
+                                      GType    type,
+                                      GError **error);
+GBytes     *flatpak_json_to_bytes (FlatpakJson *self);
 
 G_END_DECLS
 
diff --git a/common/flatpak-json.c b/common/flatpak-json.c
index 05ee097f..9ef32db3 100644
--- a/common/flatpak-json.c
+++ b/common/flatpak-json.c
@@ -47,14 +47,14 @@ flatpak_json_init (FlatpakJson *self)
 }
 
 static gboolean
-demarshal (JsonNode *parent_node,
-           const char *name,
-           gpointer dest,
-           FlatpakJsonPropType type,
-           gpointer type_data,
-           gpointer type_data2,
+demarshal (JsonNode            *parent_node,
+           const char          *name,
+           gpointer             dest,
+           FlatpakJsonPropType  type,
+           gpointer             type_data,
+           gpointer             type_data2,
            FlatpakJsonPropFlags flags,
-           GError **error)
+           GError             **error)
 {
   JsonObject *parent_object;
   JsonNode *node;
@@ -87,7 +87,7 @@ demarshal (JsonNode *parent_node,
                        "Expecting string for property %s", name);
           return FALSE;
         }
-      *(char **)dest = g_strdup (json_node_get_string (node));
+      *(char **) dest = g_strdup (json_node_get_string (node));
       break;
 
     case FLATPAK_JSON_PROP_TYPE_INT64:
@@ -98,7 +98,7 @@ demarshal (JsonNode *parent_node,
                        "Expecting int64 for property %s", name);
           return FALSE;
         }
-      *(gint64 *)dest = json_node_get_int (node);
+      *(gint64 *) dest = json_node_get_int (node);
       break;
 
     case FLATPAK_JSON_PROP_TYPE_BOOL:
@@ -109,7 +109,7 @@ demarshal (JsonNode *parent_node,
                        "Expecting bool for property %s", name);
           return FALSE;
         }
-      *(gboolean *)dest = json_node_get_boolean (node);
+      *(gboolean *) dest = json_node_get_boolean (node);
       break;
 
     case FLATPAK_JSON_PROP_TYPE_STRV:
@@ -136,7 +136,7 @@ demarshal (JsonNode *parent_node,
           }
 
         g_ptr_array_add (str_array, NULL);
-        *(char ***)dest = (char **)g_ptr_array_free (g_steal_pointer (&str_array), FALSE);
+        *(char ***) dest = (char **) g_ptr_array_free (g_steal_pointer (&str_array), FALSE);
       }
 
       break;
@@ -212,7 +212,7 @@ demarshal (JsonNode *parent_node,
                 break;
               }
 
-            new_element = g_malloc0 ((gsize)type_data2);
+            new_element = g_malloc0 ((gsize) type_data2);
             g_ptr_array_add (obj_array, new_element);
 
             for (i = 0; struct_props[i].name != NULL; i++)
@@ -234,7 +234,7 @@ demarshal (JsonNode *parent_node,
 
         /* We always set the array, even if it is partial, because we don't know how
            to free what we demarshalled so far */
-        *(gpointer *)dest = (gpointer *)g_ptr_array_free (g_steal_pointer (&obj_array), FALSE);
+        *(gpointer *) dest = (gpointer *) g_ptr_array_free (g_steal_pointer (&obj_array), FALSE);
         return res;
       }
       break;
@@ -273,7 +273,7 @@ demarshal (JsonNode *parent_node,
             g_hash_table_insert (h, g_strdup (member_name), g_strdup (val_str));
           }
 
-        *(GHashTable **)dest = g_steal_pointer (&h);
+        *(GHashTable **) dest = g_steal_pointer (&h);
       }
       break;
 
@@ -300,7 +300,7 @@ demarshal (JsonNode *parent_node,
 
         g_ptr_array_add (res, NULL);
 
-        *(char ***)dest =  (char **)g_ptr_array_free (g_steal_pointer (&res), FALSE);
+        *(char ***) dest =  (char **) g_ptr_array_free (g_steal_pointer (&res), FALSE);
       }
       break;
 
@@ -352,9 +352,9 @@ flatpak_json_from_node (JsonNode *node, GType type, GError **error)
 }
 
 FlatpakJson *
-flatpak_json_from_bytes (GBytes         *bytes,
-                        GType           type,
-                        GError        **error)
+flatpak_json_from_bytes (GBytes  *bytes,
+                         GType    type,
+                         GError **error)
 {
   g_autoptr(JsonParser) parser = NULL;
   JsonNode *root = NULL;
@@ -372,11 +372,11 @@ flatpak_json_from_bytes (GBytes         *bytes,
 }
 
 static JsonNode *
-marshal (JsonObject *parent,
-         const char *name,
-         gpointer src,
-         FlatpakJsonPropType type,
-         gpointer type_data,
+marshal (JsonObject          *parent,
+         const char          *name,
+         gpointer             src,
+         FlatpakJsonPropType  type,
+         gpointer             type_data,
          FlatpakJsonPropFlags flags)
 {
   JsonNode *retval = NULL;
@@ -385,7 +385,7 @@ marshal (JsonObject *parent,
     {
     case FLATPAK_JSON_PROP_TYPE_STRING:
       {
-        const char *str = *(const char **)src;
+        const char *str = *(const char **) src;
         if (str != NULL)
           retval = json_node_init_string (json_node_alloc (), str);
         break;
@@ -393,13 +393,13 @@ marshal (JsonObject *parent,
 
     case FLATPAK_JSON_PROP_TYPE_INT64:
       {
-        retval = json_node_init_int (json_node_alloc (), *(gint64 *)src);
+        retval = json_node_init_int (json_node_alloc (), *(gint64 *) src);
         break;
       }
 
     case FLATPAK_JSON_PROP_TYPE_BOOL:
       {
-        gboolean val = *(gboolean *)src;
+        gboolean val = *(gboolean *) src;
         if (val)
           retval = json_node_init_boolean (json_node_alloc (), val);
         break;
@@ -407,7 +407,7 @@ marshal (JsonObject *parent,
 
     case FLATPAK_JSON_PROP_TYPE_STRV:
       {
-        char **strv = *(char ***)src;
+        char **strv = *(char ***) src;
         int i;
         JsonArray *array;
 
@@ -466,7 +466,7 @@ marshal (JsonObject *parent,
     case FLATPAK_JSON_PROP_TYPE_STRUCTV:
       {
         FlatpakJsonProp *struct_props = type_data;
-        gpointer *structv = *(gpointer **)src;
+        gpointer *structv = *(gpointer **) src;
         int i, j;
         JsonArray *array;
 
@@ -504,7 +504,7 @@ marshal (JsonObject *parent,
 
     case FLATPAK_JSON_PROP_TYPE_STRMAP:
       {
-        GHashTable *map = *(GHashTable **)src;
+        GHashTable *map = *(GHashTable **) src;
 
         if (map != NULL && g_hash_table_size (map) > 0)
           {
@@ -533,7 +533,7 @@ marshal (JsonObject *parent,
 
     case FLATPAK_JSON_PROP_TYPE_BOOLMAP:
       {
-        char **map = *(char ***)src;
+        char **map = *(char ***) src;
 
         if (map != NULL && map[0] != NULL)
           {
@@ -566,9 +566,9 @@ marshal (JsonObject *parent,
 }
 
 static void
-marshal_props_for_class (FlatpakJson *self,
+marshal_props_for_class (FlatpakJson      *self,
                          FlatpakJsonClass *class,
-                         JsonObject *obj)
+                         JsonObject       *obj)
 {
   FlatpakJsonProp *props = NULL;
   int i;
@@ -578,7 +578,7 @@ marshal_props_for_class (FlatpakJson *self,
 
   if (FLATPAK_JSON_CLASS (parent_class)->props != NULL)
     marshal_props_for_class (self,
-                             FLATPAK_JSON_CLASS(parent_class),
+                             FLATPAK_JSON_CLASS (parent_class),
                              obj);
 
   props = FLATPAK_JSON_CLASS (class)->props;
@@ -617,7 +617,7 @@ flatpak_json_to_node (FlatpakJson *self)
 }
 
 GBytes *
-flatpak_json_to_bytes (FlatpakJson  *self)
+flatpak_json_to_bytes (FlatpakJson *self)
 {
   g_autoptr(JsonNode) node = NULL;
   g_autoptr(JsonGenerator) generator = NULL;
diff --git a/common/flatpak-oci-registry-private.h b/common/flatpak-oci-registry-private.h
index cdd9eb25..115f9a6e 100644
--- a/common/flatpak-oci-registry-private.h
+++ b/common/flatpak-oci-registry-private.h
@@ -55,95 +55,95 @@ typedef struct FlatpakOciLayerWriter FlatpakOciLayerWriter;
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakOciLayerWriter, g_object_unref)
 
-FlatpakOciRegistry  *  flatpak_oci_registry_new                  (const char           *uri,
-                                                                  gboolean              for_write,
-                                                                  int                   tmp_dfd,
-                                                                  GCancellable         *cancellable,
-                                                                  GError              **error);
-const char          *  flatpak_oci_registry_get_uri              (FlatpakOciRegistry   *self);
-FlatpakOciIndex     *  flatpak_oci_registry_load_index           (FlatpakOciRegistry   *self,
-                                                                  const char           *etag,
-                                                                  char               **etag_out,
-                                                                  GCancellable         *cancellable,
-                                                                  GError              **error);
-gboolean               flatpak_oci_registry_save_index           (FlatpakOciRegistry   *self,
-                                                                  FlatpakOciIndex      *index,
-                                                                  GCancellable         *cancellable,
-                                                                  GError              **error);
-int                    flatpak_oci_registry_download_blob        (FlatpakOciRegistry   *self,
-                                                                  const char           *repository,
-								  gboolean              manifest,
-                                                                  const char           *digest,
-                                                                  FlatpakLoadUriProgress progress_cb,
-                                                                  gpointer               user_data,
-                                                                  GCancellable         *cancellable,
-                                                                  GError              **error);
-GBytes             *   flatpak_oci_registry_load_blob            (FlatpakOciRegistry   *self,
-                                                                  const char           *repository,
-								  gboolean              manifest,
-                                                                  const char           *digest,
-                                                                  GCancellable         *cancellable,
-                                                                  GError              **error);
-char *                 flatpak_oci_registry_store_blob           (FlatpakOciRegistry   *self,
-                                                                  GBytes               *data,
-                                                                  GCancellable         *cancellable,
-                                                                  GError              **error);
-gboolean               flatpak_oci_registry_mirror_blob          (FlatpakOciRegistry   *self,
-                                                                  FlatpakOciRegistry   *source_registry,
-                                                                  const char           *repository,
-								  gboolean              manifest,
-                                                                  const char           *digest,
-                                                                  FlatpakLoadUriProgress progress_cb,
-                                                                  gpointer               user_data,
-                                                                  GCancellable         *cancellable,
-                                                                  GError              **error);
-FlatpakOciDescriptor * flatpak_oci_registry_store_json           (FlatpakOciRegistry   *self,
-                                                                  FlatpakJson          *json,
-                                                                  GCancellable         *cancellable,
-                                                                  GError              **error);
-FlatpakOciVersioned *  flatpak_oci_registry_load_versioned       (FlatpakOciRegistry   *self,
-                                                                  const char           *repository,
-                                                                  const char           *digest,
-                                                                  gsize                *out_size,
-                                                                  GCancellable         *cancellable,
-                                                                  GError              **error);
-FlatpakOciLayerWriter *flatpak_oci_registry_write_layer          (FlatpakOciRegistry   *self,
-                                                                  GCancellable         *cancellable,
-                                                                  GError              **error);
-
-struct archive *flatpak_oci_layer_writer_get_archive (FlatpakOciLayerWriter  *self);
-gboolean        flatpak_oci_layer_writer_close       (FlatpakOciLayerWriter  *self,
-                                                      char                 **uncompressed_digest_out,
-                                                      FlatpakOciDescriptor **res_out,
-                                                      GCancellable          *cancellable,
-                                                      GError               **error);
+FlatpakOciRegistry  *  flatpak_oci_registry_new (const char           *uri,
+                                                 gboolean for_write,
+                                                 int tmp_dfd,
+                                                 GCancellable         * cancellable,
+                                                 GError              * *error);
+const char          *  flatpak_oci_registry_get_uri (FlatpakOciRegistry *self);
+FlatpakOciIndex     *  flatpak_oci_registry_load_index (FlatpakOciRegistry *self,
+                                                        const char         *etag,
+                                                        char              **etag_out,
+                                                        GCancellable       *cancellable,
+                                                        GError            **error);
+gboolean               flatpak_oci_registry_save_index (FlatpakOciRegistry *self,
+                                                        FlatpakOciIndex    *index,
+                                                        GCancellable       *cancellable,
+                                                        GError            **error);
+int                    flatpak_oci_registry_download_blob (FlatpakOciRegistry    *self,
+                                                           const char            *repository,
+                                                           gboolean               manifest,
+                                                           const char            *digest,
+                                                           FlatpakLoadUriProgress progress_cb,
+                                                           gpointer               user_data,
+                                                           GCancellable          *cancellable,
+                                                           GError               **error);
+GBytes             *   flatpak_oci_registry_load_blob (FlatpakOciRegistry *self,
+                                                       const char         *repository,
+                                                       gboolean            manifest,
+                                                       const char         *digest,
+                                                       GCancellable       *cancellable,
+                                                       GError            **error);
+char *                 flatpak_oci_registry_store_blob (FlatpakOciRegistry *self,
+                                                        GBytes             *data,
+                                                        GCancellable       *cancellable,
+                                                        GError            **error);
+gboolean               flatpak_oci_registry_mirror_blob (FlatpakOciRegistry    *self,
+                                                         FlatpakOciRegistry    *source_registry,
+                                                         const char            *repository,
+                                                         gboolean               manifest,
+                                                         const char            *digest,
+                                                         FlatpakLoadUriProgress progress_cb,
+                                                         gpointer               user_data,
+                                                         GCancellable          *cancellable,
+                                                         GError               **error);
+FlatpakOciDescriptor * flatpak_oci_registry_store_json (FlatpakOciRegistry *self,
+                                                        FlatpakJson        *json,
+                                                        GCancellable       *cancellable,
+                                                        GError            **error);
+FlatpakOciVersioned *  flatpak_oci_registry_load_versioned (FlatpakOciRegistry *self,
+                                                            const char         *repository,
+                                                            const char         *digest,
+                                                            gsize              *out_size,
+                                                            GCancellable       *cancellable,
+                                                            GError            **error);
+FlatpakOciLayerWriter *flatpak_oci_registry_write_layer (FlatpakOciRegistry *self,
+                                                         GCancellable       *cancellable,
+                                                         GError            **error);
+
+struct archive *flatpak_oci_layer_writer_get_archive (FlatpakOciLayerWriter *self);
+gboolean        flatpak_oci_layer_writer_close (FlatpakOciLayerWriter *self,
+                                                char                 **uncompressed_digest_out,
+                                                FlatpakOciDescriptor **res_out,
+                                                GCancellable          *cancellable,
+                                                GError               **error);
 
 gboolean flatpak_archive_read_open_fd_with_checksum (struct archive *a,
-                                                     int fd,
-                                                     GChecksum *checksum,
-                                                     GError **error);
+                                                     int             fd,
+                                                     GChecksum      *checksum,
+                                                     GError        **error);
 
-GBytes *flatpak_oci_sign_data (GBytes *data,
+GBytes *flatpak_oci_sign_data (GBytes       *data,
                                const gchar **okey_ids,
-                               const char *homedir,
-                               GError **error);
+                               const char   *homedir,
+                               GError      **error);
 
 FlatpakOciSignature *flatpak_oci_verify_signature (OstreeRepo *repo,
                                                    const char *remote_name,
-                                                   GBytes *signature,
-                                                   GError **error);
+                                                   GBytes     *signature,
+                                                   GError    **error);
 
-GVariant *flatpak_oci_index_fetch_summary (SoupSession *soup_session,
-                                           const char *uri,
-                                           const char *etag,
+GVariant *flatpak_oci_index_fetch_summary (SoupSession  *soup_session,
+                                           const char   *uri,
+                                           const char   *etag,
                                            GCancellable *cancellable,
-                                           GError **error);
-
-gboolean flatpak_oci_index_verify_ref (SoupSession *soup_session,
-				       const char *uri,
-				       const char *ref,
-				       const char *digest,
-				       GCancellable *cancellable,
-				       GError **error);
+                                           GError      **error);
+
+gboolean flatpak_oci_index_verify_ref (SoupSession  *soup_session,
+                                       const char   *uri,
+                                       const char   *ref,
+                                       const char   *digest,
+                                       GCancellable *cancellable,
+                                       GError      **error);
 
 #endif /* __FLATPAK_OCI_REGISTRY_H__ */
diff --git a/common/flatpak-oci-registry.c b/common/flatpak-oci-registry.c
index 83fdf28c..96c8ff86 100644
--- a/common/flatpak-oci-registry.c
+++ b/common/flatpak-oci-registry.c
@@ -36,26 +36,26 @@ G_DEFINE_QUARK (flatpak_oci_error, flatpak_oci_error)
 #define MAX_JSON_SIZE (1024 * 1024)
 
 typedef struct archive FlatpakAutoArchiveWrite;
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(FlatpakAutoArchiveWrite, archive_write_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakAutoArchiveWrite, archive_write_free)
 
 static void flatpak_oci_registry_initable_iface_init (GInitableIface *iface);
 
 struct FlatpakOciRegistry
 {
-  GObject parent;
+  GObject  parent;
 
   gboolean for_write;
   gboolean valid;
   gboolean is_docker;
-  char *uri;
-  int tmp_dfd;
+  char    *uri;
+  int      tmp_dfd;
 
   /* Local repos */
   int dfd;
 
   /* Remote repos */
   SoupSession *soup_session;
-  SoupURI *base_uri;
+  SoupURI     *base_uri;
 };
 
 typedef struct
@@ -91,10 +91,10 @@ flatpak_oci_registry_finalize (GObject *object)
 }
 
 static void
-flatpak_oci_registry_set_property (GObject         *object,
-                                  guint            prop_id,
-                                  const GValue    *value,
-                                  GParamSpec      *pspec)
+flatpak_oci_registry_set_property (GObject      *object,
+                                   guint         prop_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
 {
   FlatpakOciRegistry *self = FLATPAK_OCI_REGISTRY (object);
   const char *uri;
@@ -109,12 +109,15 @@ flatpak_oci_registry_set_property (GObject         *object,
       else
         self->uri = g_strconcat (uri, "/", NULL);
       break;
+
     case PROP_FOR_WRITE:
       self->for_write = g_value_get_boolean (value);
       break;
+
     case PROP_TMP_DFD:
       self->tmp_dfd = g_value_get_int (value);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -122,10 +125,10 @@ flatpak_oci_registry_set_property (GObject         *object,
 }
 
 static void
-flatpak_oci_registry_get_property (GObject         *object,
-				   guint            prop_id,
-				   GValue          *value,
-				   GParamSpec      *pspec)
+flatpak_oci_registry_get_property (GObject    *object,
+                                   guint       prop_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
 {
   FlatpakOciRegistry *self = FLATPAK_OCI_REGISTRY (object);
 
@@ -134,12 +137,15 @@ flatpak_oci_registry_get_property (GObject         *object,
     case PROP_URI:
       g_value_set_string (value, self->uri);
       break;
+
     case PROP_FOR_WRITE:
       g_value_set_boolean (value, self->for_write);
       break;
+
     case PROP_TMP_DFD:
       g_value_set_int (value, self->tmp_dfd);
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -186,17 +192,17 @@ flatpak_oci_registry_init (FlatpakOciRegistry *self)
 }
 
 const char *
-flatpak_oci_registry_get_uri (FlatpakOciRegistry   *self)
+flatpak_oci_registry_get_uri (FlatpakOciRegistry *self)
 {
   return self->uri;
 }
 
 FlatpakOciRegistry *
-flatpak_oci_registry_new (const char *uri,
-			  gboolean for_write,
-			  int tmp_dfd,
-			  GCancellable *cancellable,
-			  GError **error)
+flatpak_oci_registry_new (const char   *uri,
+                          gboolean      for_write,
+                          int           tmp_dfd,
+                          GCancellable *cancellable,
+                          GError      **error)
 {
   FlatpakOciRegistry *oci_registry;
 
@@ -211,11 +217,11 @@ flatpak_oci_registry_new (const char *uri,
 }
 
 static int
-local_open_file (int dfd,
-                 const char *subpath,
-                 struct stat *st_buf,
+local_open_file (int           dfd,
+                 const char   *subpath,
+                 struct stat  *st_buf,
                  GCancellable *cancellable,
-                 GError **error)
+                 GError      **error)
 {
   glnx_autofd int fd = -1;
   struct stat tmp_st_buf;
@@ -249,12 +255,12 @@ local_open_file (int dfd,
 }
 
 static GBytes *
-local_load_file (int dfd,
-                 const char *subpath,
-                 const char *etag,
-                 char **etag_out,
+local_load_file (int           dfd,
+                 const char   *subpath,
+                 const char   *etag,
+                 char        **etag_out,
                  GCancellable *cancellable,
-                 GError **error)
+                 GError      **error)
 {
   glnx_autofd int fd = -1;
   struct stat st_buf;
@@ -285,13 +291,13 @@ local_load_file (int dfd,
 }
 
 static GBytes *
-remote_load_file (SoupSession *soup_session,
-                  SoupURI *base,
-                  const char *subpath,
-                  const char *etag,
-                  char **etag_out,
+remote_load_file (SoupSession  *soup_session,
+                  SoupURI      *base,
+                  const char   *subpath,
+                  const char   *etag,
+                  char        **etag_out,
                   GCancellable *cancellable,
-                  GError **error)
+                  GError      **error)
 {
   g_autoptr(SoupURI) uri = NULL;
   g_autoptr(GBytes) bytes = NULL;
@@ -317,12 +323,12 @@ remote_load_file (SoupSession *soup_session,
 }
 
 static GBytes *
-flatpak_oci_registry_load_file (FlatpakOciRegistry  *self,
-                                const char *subpath,
-                                const char *etag,
-                                char **etag_out,
-                                GCancellable *cancellable,
-                                GError **error)
+flatpak_oci_registry_load_file (FlatpakOciRegistry *self,
+                                const char         *subpath,
+                                const char         *etag,
+                                char              **etag_out,
+                                GCancellable       *cancellable,
+                                GError            **error)
 {
   if (self->dfd != -1)
     return local_load_file (self->dfd, subpath, etag, etag_out, cancellable, error);
@@ -357,6 +363,7 @@ static gboolean
 verify_oci_version (GBytes *oci_layout_bytes, gboolean *not_json, GCancellable *cancellable, GError **error)
 {
   const char *version;
+
   g_autoptr(JsonNode) node = NULL;
   JsonObject *oci_layout;
 
@@ -389,9 +396,9 @@ verify_oci_version (GBytes *oci_layout_bytes, gboolean *not_json, GCancellable *
 
 static gboolean
 flatpak_oci_registry_ensure_local (FlatpakOciRegistry *self,
-				   gboolean for_write,
-				   GCancellable *cancellable,
-				   GError **error)
+                                   gboolean            for_write,
+                                   GCancellable       *cancellable,
+                                   GError            **error)
 {
   g_autoptr(GFile) dir = g_file_new_for_uri (self->uri);
   glnx_autofd int local_dfd = -1;
@@ -444,7 +451,7 @@ flatpak_oci_registry_ensure_local (FlatpakOciRegistry *self,
           g_clear_error (&local_error);
 
           if (!glnx_file_replace_contents_at (dfd, "oci-layout",
-                                              (const guchar *)new_layout_data,
+                                              (const guchar *) new_layout_data,
                                               strlen (new_layout_data),
                                               0,
                                               cancellable, error))
@@ -467,9 +474,9 @@ flatpak_oci_registry_ensure_local (FlatpakOciRegistry *self,
 
 static gboolean
 flatpak_oci_registry_ensure_remote (FlatpakOciRegistry *self,
-				    gboolean for_write,
-				    GCancellable *cancellable,
-				    GError **error)
+                                    gboolean            for_write,
+                                    GCancellable       *cancellable,
+                                    GError            **error)
 {
   g_autoptr(SoupURI) baseuri = NULL;
   g_autoptr(GBytes) oci_layout_bytes = NULL;
@@ -497,15 +504,15 @@ flatpak_oci_registry_ensure_remote (FlatpakOciRegistry *self,
       gboolean not_json;
 
       if (!verify_oci_version (oci_layout_bytes, &not_json, cancellable, &local_error))
-	{
-	  if (not_json)
-	    self->is_docker = TRUE;
-	  else
-	    {
+        {
+          if (not_json)
+            self->is_docker = TRUE;
+          else
+            {
               g_propagate_error (error, g_steal_pointer (&local_error));
-	      return FALSE;
-	    }
-	}
+              return FALSE;
+            }
+        }
     }
   else
     self->is_docker = TRUE;
@@ -516,9 +523,9 @@ flatpak_oci_registry_ensure_remote (FlatpakOciRegistry *self,
 }
 
 static gboolean
-flatpak_oci_registry_initable_init (GInitable     *initable,
-				    GCancellable  *cancellable,
-				    GError       **error)
+flatpak_oci_registry_initable_init (GInitable    *initable,
+                                    GCancellable *cancellable,
+                                    GError      **error)
 {
   FlatpakOciRegistry *self = FLATPAK_OCI_REGISTRY (initable);
   gboolean res;
@@ -547,9 +554,9 @@ flatpak_oci_registry_initable_iface_init (GInitableIface *iface)
 }
 
 FlatpakOciIndex *
-flatpak_oci_registry_load_index (FlatpakOciRegistry  *self,
-                                 const char           *etag,
-                                 char               **etag_out,
+flatpak_oci_registry_load_index (FlatpakOciRegistry *self,
+                                 const char         *etag,
+                                 char              **etag_out,
                                  GCancellable       *cancellable,
                                  GError            **error)
 {
@@ -568,14 +575,14 @@ flatpak_oci_registry_load_index (FlatpakOciRegistry  *self,
       return NULL;
     }
 
-  return (FlatpakOciIndex *)flatpak_json_from_bytes (bytes, FLATPAK_TYPE_OCI_INDEX, error);
+  return (FlatpakOciIndex *) flatpak_json_from_bytes (bytes, FLATPAK_TYPE_OCI_INDEX, error);
 }
 
 gboolean
-flatpak_oci_registry_save_index (FlatpakOciRegistry  *self,
-                                 FlatpakOciIndex     *index,
-                                 GCancellable        *cancellable,
-                                 GError             **error)
+flatpak_oci_registry_save_index (FlatpakOciRegistry *self,
+                                 FlatpakOciIndex    *index,
+                                 GCancellable       *cancellable,
+                                 GError            **error)
 {
   g_autoptr(GBytes) bytes = NULL;
 
@@ -593,13 +600,13 @@ flatpak_oci_registry_save_index (FlatpakOciRegistry  *self,
 }
 
 static gboolean
-write_update_checksum (GOutputStream  *out,
-                       gconstpointer   data,
-                       gsize           len,
-                       gsize          *out_bytes_written,
-                       GChecksum      *checksum,
-                       GCancellable   *cancellable,
-                       GError        **error)
+write_update_checksum (GOutputStream *out,
+                       gconstpointer  data,
+                       gsize          len,
+                       gsize         *out_bytes_written,
+                       GChecksum     *checksum,
+                       GCancellable  *cancellable,
+                       GError       **error)
 {
   if (out)
     {
@@ -619,11 +626,11 @@ write_update_checksum (GOutputStream  *out,
 }
 
 static gboolean
-splice_update_checksum (GOutputStream  *out,
-                        GInputStream   *in,
-                        GChecksum      *checksum,
-                        GCancellable   *cancellable,
-                        GError        **error)
+splice_update_checksum (GOutputStream *out,
+                        GInputStream  *in,
+                        GChecksum     *checksum,
+                        GCancellable  *cancellable,
+                        GError       **error)
 {
   g_return_val_if_fail (out != NULL || checksum != NULL, FALSE);
 
@@ -633,7 +640,7 @@ splice_update_checksum (GOutputStream  *out,
       char buf[4096];
       do
         {
-          if (!g_input_stream_read_all (in, buf, sizeof(buf), &bytes_read, cancellable, error))
+          if (!g_input_stream_read_all (in, buf, sizeof (buf), &bytes_read, cancellable, error))
             return FALSE;
           if (!write_update_checksum (out, buf, bytes_read, &bytes_written, checksum,
                                       cancellable, error))
@@ -652,10 +659,10 @@ splice_update_checksum (GOutputStream  *out,
 
 static char *
 get_digest_subpath (FlatpakOciRegistry *self,
-		    const char *repository,
-		    gboolean is_manifest,
-		    const char *digest,
-                    GError **error)
+                    const char         *repository,
+                    gboolean            is_manifest,
+                    const char         *digest,
+                    GError            **error)
 {
   g_autoptr(GString) s = g_string_new ("");
 
@@ -678,9 +685,9 @@ get_digest_subpath (FlatpakOciRegistry *self,
   if (self->is_docker)
     {
       if (is_manifest)
-	g_string_append (s, "manifests/");
+        g_string_append (s, "manifests/");
       else
-	g_string_append (s, "blobs/");
+        g_string_append (s, "blobs/");
       g_string_append (s, digest);
     }
   else
@@ -708,8 +715,8 @@ checksum_fd (int fd, GCancellable *cancellable, GError **error)
 
 int
 flatpak_oci_registry_download_blob (FlatpakOciRegistry    *self,
-				    const char            *repository,
-				    gboolean               manifest,
+                                    const char            *repository,
+                                    gboolean               manifest,
                                     const char            *digest,
                                     FlatpakLoadUriProgress progress_cb,
                                     gpointer               user_data,
@@ -757,14 +764,14 @@ flatpak_oci_registry_download_blob (FlatpakOciRegistry    *self,
         return -1;
 
       fd = local_open_file (self->tmp_dfd, tmpfile_name, NULL, cancellable, error);
-      (void)unlinkat (self->tmp_dfd, tmpfile_name, 0);
+      (void) unlinkat (self->tmp_dfd, tmpfile_name, 0);
 
       if (fd == -1)
         return -1;
 
       if (!flatpak_download_http_uri (self->soup_session, uri_s,
-				      FLATPAK_HTTP_FLAGS_ACCEPT_OCI,
-				      out_stream,
+                                      FLATPAK_HTTP_FLAGS_ACCEPT_OCI,
+                                      out_stream,
                                       progress_cb, user_data,
                                       cancellable, error))
         return -1;
@@ -792,16 +799,17 @@ flatpak_oci_registry_download_blob (FlatpakOciRegistry    *self,
 gboolean
 flatpak_oci_registry_mirror_blob (FlatpakOciRegistry    *self,
                                   FlatpakOciRegistry    *source_registry,
-				  const char           *repository,
-				  gboolean              manifest,
+                                  const char            *repository,
+                                  gboolean               manifest,
                                   const char            *digest,
                                   FlatpakLoadUriProgress progress_cb,
                                   gpointer               user_data,
-                                  GCancellable         *cancellable,
-                                  GError              **error)
+                                  GCancellable          *cancellable,
+                                  GError               **error)
 {
   g_autofree char *src_subpath = NULL;
   g_autofree char *dst_subpath = NULL;
+
   g_auto(GLnxTmpfile) tmpf = { 0 };
   g_autoptr(GOutputStream) out_stream = NULL;
   struct stat stbuf;
@@ -841,7 +849,7 @@ flatpak_oci_registry_mirror_blob (FlatpakOciRegistry    *self,
       if (src_fd == -1)
         return FALSE;
 
-      if (glnx_regfile_copy_bytes (src_fd, tmpf.fd, (off_t)-1) < 0)
+      if (glnx_regfile_copy_bytes (src_fd, tmpf.fd, (off_t) -1) < 0)
         return glnx_throw_errno_prefix (error, "copyfile");
     }
   else
@@ -861,7 +869,7 @@ flatpak_oci_registry_mirror_blob (FlatpakOciRegistry    *self,
 
       uri_s = soup_uri_to_string (uri, FALSE);
       if (!flatpak_download_http_uri (source_registry->soup_session, uri_s,
-				      FLATPAK_HTTP_FLAGS_ACCEPT_OCI, out_stream,
+                                      FLATPAK_HTTP_FLAGS_ACCEPT_OCI, out_stream,
                                       progress_cb, user_data,
                                       cancellable, error))
         return FALSE;
@@ -893,14 +901,15 @@ flatpak_oci_registry_mirror_blob (FlatpakOciRegistry    *self,
 }
 
 GBytes *
-flatpak_oci_registry_load_blob (FlatpakOciRegistry  *self,
-				const char          *repository,
-				gboolean             manifest,
-				const char          *digest,
-				GCancellable        *cancellable,
-				GError             **error)
+flatpak_oci_registry_load_blob (FlatpakOciRegistry *self,
+                                const char         *repository,
+                                gboolean            manifest,
+                                const char         *digest,
+                                GCancellable       *cancellable,
+                                GError            **error)
 {
   g_autofree char *subpath = NULL;
+
   g_autoptr(GBytes) bytes = NULL;
   g_autofree char *json_checksum = NULL;
 
@@ -914,7 +923,7 @@ flatpak_oci_registry_load_blob (FlatpakOciRegistry  *self,
   if (bytes == NULL)
     return NULL;
 
-  json_checksum = g_compute_checksum_for_bytes  (G_CHECKSUM_SHA256, bytes);
+  json_checksum = g_compute_checksum_for_bytes (G_CHECKSUM_SHA256, bytes);
 
   if (strcmp (json_checksum, digest + strlen ("sha256:")) != 0)
     {
@@ -927,10 +936,10 @@ flatpak_oci_registry_load_blob (FlatpakOciRegistry  *self,
 }
 
 char *
-flatpak_oci_registry_store_blob (FlatpakOciRegistry  *self,
-                                GBytes             *data,
-                                GCancellable       *cancellable,
-                                GError            **error)
+flatpak_oci_registry_store_blob (FlatpakOciRegistry *self,
+                                 GBytes             *data,
+                                 GCancellable       *cancellable,
+                                 GError            **error)
 {
   g_autofree char *sha256 = g_compute_checksum_for_bytes (G_CHECKSUM_SHA256, data);
   g_autofree char *subpath = NULL;
@@ -948,10 +957,10 @@ flatpak_oci_registry_store_blob (FlatpakOciRegistry  *self,
 }
 
 FlatpakOciDescriptor *
-flatpak_oci_registry_store_json (FlatpakOciRegistry    *self,
-                                FlatpakJson           *json,
-                                GCancellable         *cancellable,
-                                GError              **error)
+flatpak_oci_registry_store_json (FlatpakOciRegistry *self,
+                                 FlatpakJson        *json,
+                                 GCancellable       *cancellable,
+                                 GError            **error)
 {
   g_autoptr(GBytes) bytes = flatpak_json_to_bytes (json);
   g_autofree char *digest = NULL;
@@ -964,12 +973,12 @@ flatpak_oci_registry_store_json (FlatpakOciRegistry    *self,
 }
 
 FlatpakOciVersioned *
-flatpak_oci_registry_load_versioned (FlatpakOciRegistry  *self,
-				     const char          *repository,
-                                     const char          *digest,
-                                     gsize               *out_size,
-                                     GCancellable        *cancellable,
-                                     GError             **error)
+flatpak_oci_registry_load_versioned (FlatpakOciRegistry *self,
+                                     const char         *repository,
+                                     const char         *digest,
+                                     gsize              *out_size,
+                                     GCancellable       *cancellable,
+                                     GError            **error)
 {
   g_autoptr(GBytes) bytes = NULL;
 
@@ -986,17 +995,17 @@ flatpak_oci_registry_load_versioned (FlatpakOciRegistry  *self,
 
 struct FlatpakOciLayerWriter
 {
-  GObject parent;
+  GObject             parent;
 
   FlatpakOciRegistry *registry;
 
-  GChecksum *uncompressed_checksum;
-  GChecksum *compressed_checksum;
-  struct archive *archive;
-  GZlibCompressor *compressor;
-  guint64 uncompressed_size;
-  guint64 compressed_size;
-  GLnxTmpfile tmpf;
+  GChecksum          *uncompressed_checksum;
+  GChecksum          *compressed_checksum;
+  struct archive     *archive;
+  GZlibCompressor    *compressor;
+  guint64             uncompressed_size;
+  guint64             compressed_size;
+  GLnxTmpfile         tmpf;
 };
 
 typedef struct
@@ -1007,7 +1016,7 @@ typedef struct
 G_DEFINE_TYPE (FlatpakOciLayerWriter, flatpak_oci_layer_writer, G_TYPE_OBJECT)
 
 static gboolean
-propagate_libarchive_error (GError      **error,
+propagate_libarchive_error (GError        **error,
                             struct archive *a)
 {
   g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
@@ -1067,21 +1076,22 @@ flatpak_oci_layer_writer_init (FlatpakOciLayerWriter *self)
 
 static int
 flatpak_oci_layer_writer_open_cb (struct archive *archive,
-                                 void *client_data)
+                                  void           *client_data)
 {
   return ARCHIVE_OK;
 }
 
 static gssize
 flatpak_oci_layer_writer_compress (FlatpakOciLayerWriter *self,
-                                  const void *buffer,
-                                  size_t length,
-                                  gboolean at_end)
+                                   const void            *buffer,
+                                   size_t                 length,
+                                   gboolean               at_end)
 {
   guchar compressed_buffer[8192];
   GConverterResult res;
   gsize total_bytes_read, bytes_read, bytes_written, to_write_len;
   guchar *to_write;
+
   g_autoptr(GError) local_error = NULL;
   GConverterFlags flags = 0;
   bytes_read = 0;
@@ -1136,9 +1146,9 @@ flatpak_oci_layer_writer_compress (FlatpakOciLayerWriter *self,
 
 static ssize_t
 flatpak_oci_layer_writer_write_cb (struct archive *archive,
-                                   void *client_data,
-                                   const void *buffer,
-                                   size_t length)
+                                   void           *client_data,
+                                   const void     *buffer,
+                                   size_t          length)
 {
   FlatpakOciLayerWriter *self = FLATPAK_OCI_LAYER_WRITER (client_data);
 
@@ -1147,7 +1157,7 @@ flatpak_oci_layer_writer_write_cb (struct archive *archive,
 
 static int
 flatpak_oci_layer_writer_close_cb (struct archive *archive,
-                                   void *client_data)
+                                   void           *client_data)
 {
   FlatpakOciLayerWriter *self = FLATPAK_OCI_LAYER_WRITER (client_data);
   gssize res;
@@ -1161,9 +1171,9 @@ flatpak_oci_layer_writer_close_cb (struct archive *archive,
 }
 
 FlatpakOciLayerWriter *
-flatpak_oci_registry_write_layer (FlatpakOciRegistry    *self,
-                                 GCancellable         *cancellable,
-                                 GError              **error)
+flatpak_oci_registry_write_layer (FlatpakOciRegistry *self,
+                                  GCancellable       *cancellable,
+                                  GError            **error)
 {
   g_autoptr(FlatpakOciLayerWriter) oci_layer_writer = NULL;
   g_autoptr(FlatpakAutoArchiveWrite) a = NULL;
@@ -1215,18 +1225,19 @@ flatpak_oci_registry_write_layer (FlatpakOciRegistry    *self,
 
   oci_layer_writer->archive = g_steal_pointer (&a);
   /* Transfer ownership of the tmpfile */
-  oci_layer_writer->tmpf = tmpf; tmpf.initialized = 0;
+  oci_layer_writer->tmpf = tmpf;
+  tmpf.initialized = 0;
   oci_layer_writer->compressor = g_zlib_compressor_new (G_ZLIB_COMPRESSOR_FORMAT_GZIP, -1);
 
   return g_steal_pointer (&oci_layer_writer);
 }
 
 gboolean
-flatpak_oci_layer_writer_close (FlatpakOciLayerWriter  *self,
-                               char                  **uncompressed_digest_out,
-                               FlatpakOciDescriptor  **res_out,
-                               GCancellable           *cancellable,
-                               GError                **error)
+flatpak_oci_layer_writer_close (FlatpakOciLayerWriter *self,
+                                char                 **uncompressed_digest_out,
+                                FlatpakOciDescriptor **res_out,
+                                GCancellable          *cancellable,
+                                GError               **error)
 {
   g_autofree char *path = NULL;
 
@@ -1256,15 +1267,16 @@ flatpak_oci_layer_writer_close (FlatpakOciLayerWriter  *self,
 }
 
 struct archive *
-flatpak_oci_layer_writer_get_archive (FlatpakOciLayerWriter  *self)
+flatpak_oci_layer_writer_get_archive (FlatpakOciLayerWriter *self)
 {
   return self->archive;
 }
 
-typedef struct {
-  int fd;
+typedef struct
+{
+  int        fd;
   GChecksum *checksum;
-  char buffer[16*1024];
+  char       buffer[16 * 1024];
 } FlatpakArchiveReadWithChecksum;
 
 static int
@@ -1291,7 +1303,7 @@ checksum_read_cb (struct archive *a, void *user_data, const void **buff)
       return -1;
     }
 
-  g_checksum_update (data->checksum, (guchar *)data->buffer, bytes_read);
+  g_checksum_update (data->checksum, (guchar *) data->buffer, bytes_read);
 
   return bytes_read;
 }
@@ -1322,9 +1334,9 @@ checksum_close_cb (struct archive *a, void *user_data)
 
 gboolean
 flatpak_archive_read_open_fd_with_checksum (struct archive *a,
-                                            int fd,
-                                            GChecksum *checksum,
-                                            GError **error)
+                                            int             fd,
+                                            GChecksum      *checksum,
+                                            GError        **error)
 {
   FlatpakArchiveReadWithChecksum *data = g_new0 (FlatpakArchiveReadWithChecksum, 1);
 
@@ -1341,13 +1353,13 @@ flatpak_archive_read_open_fd_with_checksum (struct archive *a,
   return TRUE;
 }
 
-G_DEFINE_AUTO_CLEANUP_FREE_FUNC(gpgme_data_t, gpgme_data_release, NULL)
-G_DEFINE_AUTO_CLEANUP_FREE_FUNC(gpgme_ctx_t, gpgme_release, NULL)
-G_DEFINE_AUTO_CLEANUP_FREE_FUNC(gpgme_key_t, gpgme_key_unref, NULL)
+G_DEFINE_AUTO_CLEANUP_FREE_FUNC (gpgme_data_t, gpgme_data_release, NULL)
+G_DEFINE_AUTO_CLEANUP_FREE_FUNC (gpgme_ctx_t, gpgme_release, NULL)
+G_DEFINE_AUTO_CLEANUP_FREE_FUNC (gpgme_key_t, gpgme_key_unref, NULL)
 
 static void
-flatpak_gpgme_error_to_gio_error (gpgme_error_t   gpg_error,
-                                  GError        **error)
+flatpak_gpgme_error_to_gio_error (gpgme_error_t gpg_error,
+                                  GError      **error)
 {
   GIOErrorEnum errcode;
 
@@ -1355,22 +1367,22 @@ flatpak_gpgme_error_to_gio_error (gpgme_error_t   gpg_error,
 
   switch (gpgme_err_code (gpg_error))
     {
-      /* special case - shouldn't be here */
-      case GPG_ERR_NO_ERROR:
-        g_return_if_reached ();
+    /* special case - shouldn't be here */
+    case GPG_ERR_NO_ERROR:
+      g_return_if_reached ();
 
-      /* special case - abort on out-of-memory */
-      case GPG_ERR_ENOMEM:
-        g_error ("%s: out of memory",
-                 gpgme_strsource (gpg_error));
+    /* special case - abort on out-of-memory */
+    case GPG_ERR_ENOMEM:
+      g_error ("%s: out of memory",
+               gpgme_strsource (gpg_error));
 
-      case GPG_ERR_INV_VALUE:
-        errcode = G_IO_ERROR_INVALID_ARGUMENT;
-        break;
+    case GPG_ERR_INV_VALUE:
+      errcode = G_IO_ERROR_INVALID_ARGUMENT;
+      break;
 
-      default:
-        errcode = G_IO_ERROR_FAILED;
-        break;
+    default:
+      errcode = G_IO_ERROR_FAILED;
+      break;
     }
 
   g_set_error (error, G_IO_ERROR, errcode, "%s: error code %d",
@@ -1388,98 +1400,127 @@ set_errno_from_gio_error (GError *error)
 
   switch (error->code)
     {
-      case G_IO_ERROR_FAILED:
-        errno = EIO;
-        break;
-      case G_IO_ERROR_NOT_FOUND:
-        errno = ENOENT;
-        break;
-      case G_IO_ERROR_EXISTS:
-        errno = EEXIST;
-        break;
-      case G_IO_ERROR_IS_DIRECTORY:
-        errno = EISDIR;
-        break;
-      case G_IO_ERROR_NOT_DIRECTORY:
-        errno = ENOTDIR;
-        break;
-      case G_IO_ERROR_NOT_EMPTY:
-        errno = ENOTEMPTY;
-        break;
-      case G_IO_ERROR_NOT_REGULAR_FILE:
-      case G_IO_ERROR_NOT_SYMBOLIC_LINK:
-      case G_IO_ERROR_NOT_MOUNTABLE_FILE:
-        errno = EBADF;
-        break;
-      case G_IO_ERROR_FILENAME_TOO_LONG:
-        errno = ENAMETOOLONG;
-        break;
-      case G_IO_ERROR_INVALID_FILENAME:
-        errno = EINVAL;
-        break;
-      case G_IO_ERROR_TOO_MANY_LINKS:
-        errno = EMLINK;
-        break;
-      case G_IO_ERROR_NO_SPACE:
-        errno = ENOSPC;
-        break;
-      case G_IO_ERROR_INVALID_ARGUMENT:
-        errno = EINVAL;
-        break;
-      case G_IO_ERROR_PERMISSION_DENIED:
-        errno = EPERM;
-        break;
-      case G_IO_ERROR_NOT_SUPPORTED:
-        errno = ENOTSUP;
-        break;
-      case G_IO_ERROR_NOT_MOUNTED:
-        errno = ENOENT;
-        break;
-      case G_IO_ERROR_ALREADY_MOUNTED:
-        errno = EALREADY;
-        break;
-      case G_IO_ERROR_CLOSED:
-        errno = EBADF;
-        break;
-      case G_IO_ERROR_CANCELLED:
-        errno = EINTR;
-        break;
-      case G_IO_ERROR_PENDING:
-        errno = EALREADY;
-        break;
-      case G_IO_ERROR_READ_ONLY:
-        errno = EACCES;
-        break;
-      case G_IO_ERROR_CANT_CREATE_BACKUP:
-        errno = EIO;
-        break;
-      case G_IO_ERROR_WRONG_ETAG:
-        errno = EACCES;
-        break;
-      case G_IO_ERROR_TIMED_OUT:
-        errno = EIO;
-        break;
-      case G_IO_ERROR_WOULD_RECURSE:
-        errno = ELOOP;
-        break;
-      case G_IO_ERROR_BUSY:
-        errno = EBUSY;
-        break;
-      case G_IO_ERROR_WOULD_BLOCK:
-        errno = EWOULDBLOCK;
-        break;
-      case G_IO_ERROR_HOST_NOT_FOUND:
-        errno = EHOSTDOWN;
-        break;
-      case G_IO_ERROR_WOULD_MERGE:
-        errno = EIO;
-        break;
-      case G_IO_ERROR_FAILED_HANDLED:
-        errno = 0;
-        break;
-      default:
-        errno = EIO;
-        break;
+    case G_IO_ERROR_FAILED:
+      errno = EIO;
+      break;
+
+    case G_IO_ERROR_NOT_FOUND:
+      errno = ENOENT;
+      break;
+
+    case G_IO_ERROR_EXISTS:
+      errno = EEXIST;
+      break;
+
+    case G_IO_ERROR_IS_DIRECTORY:
+      errno = EISDIR;
+      break;
+
+    case G_IO_ERROR_NOT_DIRECTORY:
+      errno = ENOTDIR;
+      break;
+
+    case G_IO_ERROR_NOT_EMPTY:
+      errno = ENOTEMPTY;
+      break;
+
+    case G_IO_ERROR_NOT_REGULAR_FILE:
+    case G_IO_ERROR_NOT_SYMBOLIC_LINK:
+    case G_IO_ERROR_NOT_MOUNTABLE_FILE:
+      errno = EBADF;
+      break;
+
+    case G_IO_ERROR_FILENAME_TOO_LONG:
+      errno = ENAMETOOLONG;
+      break;
+
+    case G_IO_ERROR_INVALID_FILENAME:
+      errno = EINVAL;
+      break;
+
+    case G_IO_ERROR_TOO_MANY_LINKS:
+      errno = EMLINK;
+      break;
+
+    case G_IO_ERROR_NO_SPACE:
+      errno = ENOSPC;
+      break;
+
+    case G_IO_ERROR_INVALID_ARGUMENT:
+      errno = EINVAL;
+      break;
+
+    case G_IO_ERROR_PERMISSION_DENIED:
+      errno = EPERM;
+      break;
+
+    case G_IO_ERROR_NOT_SUPPORTED:
+      errno = ENOTSUP;
+      break;
+
+    case G_IO_ERROR_NOT_MOUNTED:
+      errno = ENOENT;
+      break;
+
+    case G_IO_ERROR_ALREADY_MOUNTED:
+      errno = EALREADY;
+      break;
+
+    case G_IO_ERROR_CLOSED:
+      errno = EBADF;
+      break;
+
+    case G_IO_ERROR_CANCELLED:
+      errno = EINTR;
+      break;
+
+    case G_IO_ERROR_PENDING:
+      errno = EALREADY;
+      break;
+
+    case G_IO_ERROR_READ_ONLY:
+      errno = EACCES;
+      break;
+
+    case G_IO_ERROR_CANT_CREATE_BACKUP:
+      errno = EIO;
+      break;
+
+    case G_IO_ERROR_WRONG_ETAG:
+      errno = EACCES;
+      break;
+
+    case G_IO_ERROR_TIMED_OUT:
+      errno = EIO;
+      break;
+
+    case G_IO_ERROR_WOULD_RECURSE:
+      errno = ELOOP;
+      break;
+
+    case G_IO_ERROR_BUSY:
+      errno = EBUSY;
+      break;
+
+    case G_IO_ERROR_WOULD_BLOCK:
+      errno = EWOULDBLOCK;
+      break;
+
+    case G_IO_ERROR_HOST_NOT_FOUND:
+      errno = EHOSTDOWN;
+      break;
+
+    case G_IO_ERROR_WOULD_MERGE:
+      errno = EIO;
+      break;
+
+    case G_IO_ERROR_FAILED_HANDLED:
+      errno = 0;
+      break;
+
+    default:
+      errno = EIO;
+      break;
     }
 }
 
@@ -1520,24 +1561,28 @@ data_seek_cb (void *handle, off_t offset, int whence)
   g_return_val_if_fail (G_IS_INPUT_STREAM (stream) ||
                         G_IS_OUTPUT_STREAM (stream), -1);
 
-  if (!G_IS_SEEKABLE (stream)) {
-    errno = EOPNOTSUPP;
-    goto out;
-  }
+  if (!G_IS_SEEKABLE (stream))
+    {
+      errno = EOPNOTSUPP;
+      goto out;
+    }
 
   switch (whence)
     {
-      case SEEK_SET:
-        seek_type = G_SEEK_SET;
-        break;
-      case SEEK_CUR:
-        seek_type = G_SEEK_CUR;
-        break;
-      case SEEK_END:
-        seek_type = G_SEEK_END;
-        break;
-      default:
-        g_assert_not_reached ();
+    case SEEK_SET:
+      seek_type = G_SEEK_SET;
+      break;
+
+    case SEEK_CUR:
+      seek_type = G_SEEK_CUR;
+      break;
+
+    case SEEK_END:
+      seek_type = G_SEEK_END;
+      break;
+
+    default:
+      g_assert_not_reached ();
     }
 
   seekable = G_SEEKABLE (stream);
@@ -1598,9 +1643,10 @@ flatpak_gpgme_data_output (GOutputStream *output_stream)
 
 static gpgme_ctx_t
 flatpak_gpgme_new_ctx (const char *homedir,
-                       GError **error)
+                       GError    **error)
 {
   gpgme_error_t err;
+
   g_auto(gpgme_ctx_t) context = NULL;
 
   if ((err = gpgme_new (&context)) != GPG_ERR_NO_ERROR)
@@ -1630,10 +1676,10 @@ flatpak_gpgme_new_ctx (const char *homedir,
 }
 
 GBytes *
-flatpak_oci_sign_data (GBytes *data,
+flatpak_oci_sign_data (GBytes       *data,
                        const gchar **key_ids,
-                       const char *homedir,
-                       GError **error)
+                       const char   *homedir,
+                       GError      **error)
 {
   g_auto(GLnxTmpfile) tmpf = { 0 };
   g_autoptr(GOutputStream) tmp_signature_output = NULL;
@@ -1662,7 +1708,7 @@ flatpak_oci_sign_data (GBytes *data,
       err = gpgme_get_key (context, key_ids[i], &key, 1);
       if (gpgme_err_code (err) == GPG_ERR_EOF)
         {
-          flatpak_fail (error,"No gpg key found with ID %s (homedir: %s)", key_ids[i],
+          flatpak_fail (error, "No gpg key found with ID %s (homedir: %s)", key_ids[i],
                         homedir ? homedir : "<default>");
           return NULL;
         }
@@ -1740,7 +1786,7 @@ read_gpg_buffer (gpgme_data_t buffer, GError **error)
       flatpak_fail (error, "Can't seek in gpg plain text");
       return NULL;
     }
-  while ((ret = gpgme_data_read (buffer, buf, sizeof(buf)-1)) > 0)
+  while ((ret = gpgme_data_read (buffer, buf, sizeof (buf) - 1)) > 0)
     g_string_append_len (res, buf, ret);
   if (ret < 0)
     {
@@ -1752,15 +1798,16 @@ read_gpg_buffer (gpgme_data_t buffer, GError **error)
 }
 
 static gboolean
-flatpak_gpgme_ctx_tmp_home_dir (gpgme_ctx_t     gpgme_ctx,
-                                GLnxTmpDir     *tmpdir,
-                                OstreeRepo     *repo,
-                                const char     *remote_name,
-                                GCancellable   *cancellable,
-                                GError        **error)
+flatpak_gpgme_ctx_tmp_home_dir (gpgme_ctx_t   gpgme_ctx,
+                                GLnxTmpDir   *tmpdir,
+                                OstreeRepo   *repo,
+                                const char   *remote_name,
+                                GCancellable *cancellable,
+                                GError      **error)
 {
   g_autofree char *tmp_home_dir_pattern = NULL;
   gpgme_error_t gpg_error;
+
   g_autoptr(GFile) keyring_file = NULL;
   g_autofree char *keyring_name = NULL;
 
@@ -1805,11 +1852,12 @@ flatpak_gpgme_ctx_tmp_home_dir (gpgme_ctx_t     gpgme_ctx,
 FlatpakOciSignature *
 flatpak_oci_verify_signature (OstreeRepo *repo,
                               const char *remote_name,
-                              GBytes *signed_data,
-                              GError **error)
+                              GBytes     *signed_data,
+                              GError    **error)
 {
   gpgme_ctx_t context;
   gpgme_error_t gpg_error;
+
   g_auto(gpgme_data_t) signed_data_buffer = NULL;
   g_auto(gpgme_data_t) plain_buffer = NULL;
   gpgme_verify_result_t vresult;
@@ -1882,7 +1930,7 @@ flatpak_oci_verify_signature (OstreeRepo *repo,
   if (json == NULL)
     return FALSE;
 
-  return (FlatpakOciSignature *)g_steal_pointer (&json);
+  return (FlatpakOciSignature *) g_steal_pointer (&json);
 }
 
 static const char *
@@ -1891,8 +1939,9 @@ get_image_ref (FlatpakOciIndexImage *img)
   return g_hash_table_lookup (img->annotations, "org.flatpak.ref");
 }
 
-typedef struct {
-  char *repository;
+typedef struct
+{
+  char                 *repository;
   FlatpakOciIndexImage *image;
 } ImageInfo;
 
@@ -1907,11 +1956,11 @@ compare_image_by_ref (ImageInfo *a,
 }
 
 GVariant *
-flatpak_oci_index_fetch_summary (SoupSession *soup_session,
-                                 const char *uri,
-                                 const char *etag,
+flatpak_oci_index_fetch_summary (SoupSession  *soup_session,
+                                 const char   *uri,
+                                 const char   *etag,
                                  GCancellable *cancellable,
-                                 GError **error)
+                                 GError      **error)
 {
   g_autoptr(GBytes) res = NULL;
   g_autofree char *new_etag = NULL;
@@ -1939,10 +1988,10 @@ flatpak_oci_index_fetch_summary (SoupSession *soup_session,
   g_string_append (index_uri, "/static");
   soup_uri = soup_uri_new (index_uri->str);
   soup_uri_set_query_from_fields (soup_uri,
-				  "os", "linux",
-				  "tag", "latest",
-				  "annotation:org.flatpak.ref:exists", "1",
-				  NULL);
+                                  "os", "linux",
+                                  "tag", "latest",
+                                  "annotation:org.flatpak.ref:exists", "1",
+                                  NULL);
   query_uri = soup_uri_to_string (soup_uri, FALSE);
 
   res = flatpak_load_http_uri (soup_session,
@@ -1957,7 +2006,7 @@ flatpak_oci_index_fetch_summary (SoupSession *soup_session,
   if (json == NULL)
     return NULL;
 
-  response = (FlatpakOciIndexResponse *)json;
+  response = (FlatpakOciIndexResponse *) json;
 
   registry_uri = soup_uri_new_with_base (soup_uri, response->registry);
   registry_uri_s = soup_uri_to_string (registry_uri, FALSE);
@@ -1969,10 +2018,10 @@ flatpak_oci_index_fetch_summary (SoupSession *soup_session,
       ImageInfo info = { r->name };
 
       for (j = 0; r->images != NULL && r->images[j] != NULL; j++)
-	{
-	  info.image = r->images[j];
-	  g_array_append_val (images, info);
-	}
+        {
+          info.image = r->images[j];
+          g_array_append_val (images, info);
+        }
 
       for (j = 0; r->lists != NULL && r->lists[j] != NULL; j++)
         {
@@ -1980,10 +2029,10 @@ flatpak_oci_index_fetch_summary (SoupSession *soup_session,
           int k;
 
           for (k = 0; list->images != NULL && list->images[k] != NULL; k++)
-	    {
-	      info.image = list->images[k];
-	      g_array_append_val (images, info);
-	    }
+            {
+              info.image = list->images[k];
+              g_array_append_val (images, info);
+            }
         }
     }
 
@@ -1992,7 +2041,7 @@ flatpak_oci_index_fetch_summary (SoupSession *soup_session,
   additional_metadata_builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
 
   /* The summary has to be sorted by ref */
-  g_array_sort (images, (GCompareFunc)compare_image_by_ref);
+  g_array_sort (images, (GCompareFunc) compare_image_by_ref);
 
   for (i = 0; i < images->len; i++)
     {
@@ -2033,7 +2082,7 @@ flatpak_oci_index_fetch_summary (SoupSession *soup_session,
       ref_metadata_builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
 
       g_variant_builder_add (ref_metadata_builder, "{sv}", "xa.oci-repository",
-			     g_variant_new_string (info->repository));
+                             g_variant_new_string (info->repository));
 
       g_variant_builder_add_value (refs_builder,
                                    g_variant_new ("(s(t@ay@a{sv}))", ref,
@@ -2067,12 +2116,12 @@ flatpak_oci_index_fetch_summary (SoupSession *soup_session,
 }
 
 gboolean
-flatpak_oci_index_verify_ref (SoupSession *soup_session,
-			      const char *uri,
-			      const char *ref,
-			      const char *digest,
-			      GCancellable *cancellable,
-			      GError **error)
+flatpak_oci_index_verify_ref (SoupSession  *soup_session,
+                              const char   *uri,
+                              const char   *ref,
+                              const char   *digest,
+                              GCancellable *cancellable,
+                              GError      **error)
 {
   g_autoptr(GBytes) res = NULL;
   g_autoptr(FlatpakJson) json = NULL;
@@ -2093,9 +2142,9 @@ flatpak_oci_index_verify_ref (SoupSession *soup_session,
 
   soup_uri = soup_uri_new (index_uri->str);
   soup_uri_set_query_from_fields (soup_uri,
-				  "os", "linux",
-				  "annotation:org.flatpak.ref", ref,
-				  NULL);
+                                  "os", "linux",
+                                  "annotation:org.flatpak.ref", ref,
+                                  NULL);
   query_uri = soup_uri_to_string (soup_uri, FALSE);
 
   res = flatpak_load_http_uri (soup_session,
@@ -2109,7 +2158,7 @@ flatpak_oci_index_verify_ref (SoupSession *soup_session,
   if (json == NULL)
     return FALSE;
 
-  response = (FlatpakOciIndexResponse *)json;
+  response = (FlatpakOciIndexResponse *) json;
 
   for (i = 0; response->results != NULL && response->results[i] != NULL; i++)
     {
@@ -2117,14 +2166,14 @@ flatpak_oci_index_verify_ref (SoupSession *soup_session,
       int j;
 
       for (j = 0; r->images != NULL && r->images[j] != NULL; j++)
-	{
-	  FlatpakOciIndexImage *image = r->images[j];
-	  const char *image_ref = get_image_ref (image);
-	  if (image_ref != NULL &&
-	      g_strcmp0 (image_ref, ref) == 0 &&
-	      g_strcmp0 (digest, image->digest) == 0)
-	    return TRUE;
-	}
+        {
+          FlatpakOciIndexImage *image = r->images[j];
+          const char *image_ref = get_image_ref (image);
+          if (image_ref != NULL &&
+              g_strcmp0 (image_ref, ref) == 0 &&
+              g_strcmp0 (digest, image->digest) == 0)
+            return TRUE;
+        }
 
       for (j = 0; r->lists != NULL && r->lists[j] != NULL; j++)
         {
@@ -2132,14 +2181,14 @@ flatpak_oci_index_verify_ref (SoupSession *soup_session,
           int k;
 
           for (k = 0; list->images != NULL && list->images[k] != NULL; k++)
-	    {
-	      FlatpakOciIndexImage *image = list->images[k];
-	      const char *image_ref = get_image_ref (image);
-	      if (image_ref != NULL &&
-		  g_strcmp0 (image_ref, ref) == 0 &&
-		  g_strcmp0 (digest, image->digest) == 0)
-		return TRUE;
-	    }
+            {
+              FlatpakOciIndexImage *image = list->images[k];
+              const char *image_ref = get_image_ref (image);
+              if (image_ref != NULL &&
+                  g_strcmp0 (image_ref, ref) == 0 &&
+                  g_strcmp0 (digest, image->digest) == 0)
+                return TRUE;
+            }
         }
     }
 
diff --git a/common/flatpak-ref.c b/common/flatpak-ref.c
index b74e4153..fd22f5c5 100644
--- a/common/flatpak-ref.c
+++ b/common/flatpak-ref.c
@@ -186,28 +186,28 @@ flatpak_ref_class_init (FlatpakRefClass *klass)
                                                         "Name",
                                                         "The name of the application or runtime",
                                                         NULL,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_ARCH,
                                    g_param_spec_string ("arch",
                                                         "Architecture",
                                                         "The architecture of the application or runtime",
                                                         NULL,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_BRANCH,
                                    g_param_spec_string ("branch",
                                                         "Branch",
                                                         "The branch of the application or runtime",
                                                         NULL,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_COMMIT,
                                    g_param_spec_string ("commit",
                                                         "Commit",
                                                         "The commit",
                                                         NULL,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_KIND,
                                    g_param_spec_enum ("kind",
@@ -215,14 +215,14 @@ flatpak_ref_class_init (FlatpakRefClass *klass)
                                                       "The kind of artifact",
                                                       FLATPAK_TYPE_REF_KIND,
                                                       FLATPAK_REF_KIND_APP,
-                                                      G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_COLLECTION_ID,
                                    g_param_spec_string ("collection-id",
                                                         "Collection ID",
                                                         "The collection ID",
                                                         NULL,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 }
 
 static void
diff --git a/common/flatpak-related-ref-private.h b/common/flatpak-related-ref-private.h
index a0560e97..4a610d1f 100644
--- a/common/flatpak-related-ref-private.h
+++ b/common/flatpak-related-ref-private.h
@@ -32,7 +32,7 @@ FlatpakRelatedRef *flatpak_related_ref_new (const char  *collection_id,
                                             const char  *full_ref,
                                             const char  *commit,
                                             char       **subpaths,
-                                            gboolean     download,
+                                            gboolean download,
                                             gboolean     delete);
 
 #endif /* __FLATPAK_RELATED_REF_PRIVATE_H__ */
diff --git a/common/flatpak-related-ref.c b/common/flatpak-related-ref.c
index 21a67a95..44215d81 100644
--- a/common/flatpak-related-ref.c
+++ b/common/flatpak-related-ref.c
@@ -72,9 +72,9 @@ flatpak_related_ref_finalize (GObject *object)
 
 static void
 flatpak_related_ref_set_property (GObject      *object,
-                                    guint         prop_id,
-                                    const GValue *value,
-                                    GParamSpec   *pspec)
+                                  guint         prop_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
 {
   FlatpakRelatedRef *self = FLATPAK_RELATED_REF (object);
   FlatpakRelatedRefPrivate *priv = flatpak_related_ref_get_instance_private (self);
@@ -106,9 +106,9 @@ flatpak_related_ref_set_property (GObject      *object,
 
 static void
 flatpak_related_ref_get_property (GObject    *object,
-                                    guint       prop_id,
-                                    GValue     *value,
-                                    GParamSpec *pspec)
+                                  guint       prop_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
 {
   FlatpakRelatedRef *self = FLATPAK_RELATED_REF (object);
   FlatpakRelatedRefPrivate *priv = flatpak_related_ref_get_instance_private (self);
@@ -152,28 +152,28 @@ flatpak_related_ref_class_init (FlatpakRelatedRefClass *klass)
                                                          "Should download",
                                                          "Whether to auto-download the ref with the main ref",
                                                          FALSE,
-                                                         G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_SHOULD_DELETE,
                                    g_param_spec_boolean ("should-delete",
                                                          "Should delete",
                                                          "Whether to auto-delete the ref with the main ref",
                                                          FALSE,
-                                                         G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_SHOULD_AUTOPRUNE,
                                    g_param_spec_boolean ("should-autoprune",
                                                          "Should autoprune",
                                                          "Whether to delete when pruning unused refs",
                                                          FALSE,
-                                                         G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_SUBPATHS,
                                    g_param_spec_boxed ("subpaths",
                                                        "",
                                                        "",
                                                        G_TYPE_STRV,
-                                                       G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -189,8 +189,8 @@ flatpak_related_ref_init (FlatpakRelatedRef *self)
  *
  * Returns: %TRUE if the ref should be downloaded with the main ref.
  *
- * Since: 0.6.7 
-*/
+ * Since: 0.6.7
+ */
 gboolean
 flatpak_related_ref_should_download (FlatpakRelatedRef *self)
 {
@@ -207,7 +207,7 @@ flatpak_related_ref_should_download (FlatpakRelatedRef *self)
  *
  * Returns: %TRUE if the ref should be deleted with the main ref.
  *
- * Since: 0.6.7 
+ * Since: 0.6.7
  */
 gboolean
 flatpak_related_ref_should_delete (FlatpakRelatedRef *self)
@@ -244,7 +244,7 @@ flatpak_related_ref_should_autoprune (FlatpakRelatedRef *self)
  *
  * Returns: (transfer none): A strv, or %NULL
  *
- * Since: 0.6.7 
+ * Since: 0.6.7
  */
 const char * const *
 flatpak_related_ref_get_subpaths (FlatpakRelatedRef *self)
@@ -256,12 +256,12 @@ flatpak_related_ref_get_subpaths (FlatpakRelatedRef *self)
 
 
 FlatpakRelatedRef *
-flatpak_related_ref_new (const char  *collection_id,
-                         const char  *full_ref,
-                         const char  *commit,
-                         char       **subpaths,
-                         gboolean     download,
-                         gboolean     delete)
+flatpak_related_ref_new (const char *collection_id,
+                         const char *full_ref,
+                         const char *commit,
+                         char      **subpaths,
+                         gboolean    download,
+                         gboolean    delete)
 {
   FlatpakRefKind kind = FLATPAK_REF_KIND_APP;
   FlatpakRelatedRef *ref;
@@ -276,7 +276,7 @@ flatpak_related_ref_new (const char  *collection_id,
   /* Canonicalize the "no subpaths" case */
   if (subpaths && *subpaths == NULL)
     subpaths = NULL;
-  
+
   ref = g_object_new (FLATPAK_TYPE_RELATED_REF,
                       "kind", kind,
                       "name", parts[1],
diff --git a/common/flatpak-related-ref.h b/common/flatpak-related-ref.h
index 1f2bce21..f33dae8c 100644
--- a/common/flatpak-related-ref.h
+++ b/common/flatpak-related-ref.h
@@ -50,7 +50,7 @@ typedef struct
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakRelatedRef, g_object_unref)
 #endif
 
-FLATPAK_EXTERN const char * const *flatpak_related_ref_get_subpaths (FlatpakRelatedRef *self);
+FLATPAK_EXTERN const char * const *flatpak_related_ref_get_subpaths (FlatpakRelatedRef * self);
 FLATPAK_EXTERN gboolean     flatpak_related_ref_should_download (FlatpakRelatedRef *self);
 FLATPAK_EXTERN gboolean     flatpak_related_ref_should_delete (FlatpakRelatedRef *self);
 FLATPAK_EXTERN gboolean     flatpak_related_ref_should_autoprune (FlatpakRelatedRef *self);
diff --git a/common/flatpak-remote-private.h b/common/flatpak-remote-private.h
index 6402e98e..5dbf2e4a 100644
--- a/common/flatpak-remote-private.h
+++ b/common/flatpak-remote-private.h
@@ -36,9 +36,9 @@ FlatpakRemote *flatpak_remote_new_from_ostree (OstreeRemote     *remote,
                                                OstreeRepoFinder *repo_finder,
                                                FlatpakDir       *dir);
 
-gboolean flatpak_remote_commit (FlatpakRemote   *self,
-                                FlatpakDir      *dir,
-                                GCancellable    *cancellable,
-                                GError         **error);
+gboolean flatpak_remote_commit (FlatpakRemote *self,
+                                FlatpakDir    *dir,
+                                GCancellable  *cancellable,
+                                GError       **error);
 
 #endif /* __FLATPAK_REMOTE_PRIVATE_H__ */
diff --git a/common/flatpak-remote-ref-private.h b/common/flatpak-remote-ref-private.h
index 52d8b5f6..71522c42 100644
--- a/common/flatpak-remote-ref-private.h
+++ b/common/flatpak-remote-ref-private.h
@@ -29,8 +29,8 @@
 #include <flatpak-dir-private.h>
 
 FlatpakRemoteRef *flatpak_remote_ref_new (FlatpakCollectionRef *coll_ref,
-                                          const char *commit,
-                                          const char *remote_name,
-                                          FlatpakRemoteState *remote_state);
+                                          const char           *commit,
+                                          const char           *remote_name,
+                                          FlatpakRemoteState   *remote_state);
 
 #endif /* __FLATPAK_REMOTE_REF_PRIVATE_H__ */
diff --git a/common/flatpak-remote-ref.c b/common/flatpak-remote-ref.c
index f42c68e9..d252439e 100644
--- a/common/flatpak-remote-ref.c
+++ b/common/flatpak-remote-ref.c
@@ -39,12 +39,12 @@ typedef struct _FlatpakRemoteRefPrivate FlatpakRemoteRefPrivate;
 
 struct _FlatpakRemoteRefPrivate
 {
-  char *remote_name;
+  char   *remote_name;
   guint64 installed_size;
   guint64 download_size;
   GBytes *metadata;
-  char *eol;
-  char *eol_rebase;
+  char   *eol;
+  char   *eol_rebase;
 
 };
 
@@ -176,42 +176,42 @@ flatpak_remote_ref_class_init (FlatpakRemoteRefClass *klass)
                                                         "Remote Name",
                                                         "The name of the remote",
                                                         NULL,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_INSTALLED_SIZE,
                                    g_param_spec_uint64 ("installed-size",
                                                         "Installed Size",
                                                         "The installed size of the application",
                                                         0, G_MAXUINT64, 0,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_DOWNLOAD_SIZE,
                                    g_param_spec_uint64 ("download-size",
                                                         "Download Size",
                                                         "The download size of the application",
                                                         0, G_MAXUINT64, 0,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_METADATA,
                                    g_param_spec_boxed ("metadata",
                                                        "Metadata",
                                                        "The metadata info for the application",
                                                        G_TYPE_BYTES,
-                                                       G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_EOL,
                                    g_param_spec_string ("end-of-life",
                                                         "End of life",
                                                         "The reason for the ref to be end of life",
                                                         NULL,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_EOL_REBASE,
                                    g_param_spec_string ("end-of-life-rebase",
                                                         "End of life rebase",
                                                         "The new ref for the end of lifeed ref",
                                                         NULL,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -320,13 +320,14 @@ flatpak_remote_ref_get_eol_rebase (FlatpakRemoteRef *self)
 
 FlatpakRemoteRef *
 flatpak_remote_ref_new (FlatpakCollectionRef *coll_ref,
-                        const char *commit,
-                        const char *remote_name,
-                        FlatpakRemoteState *state)
+                        const char           *commit,
+                        const char           *remote_name,
+                        FlatpakRemoteState   *state)
 {
   FlatpakRefKind kind = FLATPAK_REF_KIND_APP;
   guint64 download_size = 0, installed_size = 0;
   const char *metadata = NULL;
+
   g_autoptr(GBytes) metadata_bytes = NULL;
   g_auto(GStrv) parts = NULL;
   FlatpakRemoteRef *ref;
diff --git a/common/flatpak-remote.c b/common/flatpak-remote.c
index eb48f05b..db47df3d 100644
--- a/common/flatpak-remote.c
+++ b/common/flatpak-remote.c
@@ -53,31 +53,31 @@ typedef struct _FlatpakRemotePrivate FlatpakRemotePrivate;
 
 struct _FlatpakRemotePrivate
 {
-  char       *name;
-  FlatpakDir *dir;
-
-  char       *local_url;
-  char       *local_collection_id;
-  char       *local_title;
-  char       *local_default_branch;
-  gboolean    local_gpg_verify;
-  gboolean    local_noenumerate;
-  gboolean    local_nodeps;
-  gboolean    local_disabled;
-  int         local_prio;
+  char             *name;
+  FlatpakDir       *dir;
+
+  char             *local_url;
+  char             *local_collection_id;
+  char             *local_title;
+  char             *local_default_branch;
+  gboolean          local_gpg_verify;
+  gboolean          local_noenumerate;
+  gboolean          local_nodeps;
+  gboolean          local_disabled;
+  int               local_prio;
   FlatpakRemoteType type;
 
-  guint       local_url_set : 1;
-  guint       local_collection_id_set : 1;
-  guint       local_title_set : 1;
-  guint       local_default_branch_set : 1;
-  guint       local_gpg_verify_set : 1;
-  guint       local_noenumerate_set : 1;
-  guint       local_nodeps_set : 1;
-  guint       local_disabled_set : 1;
-  guint       local_prio_set : 1;
-
-  GBytes     *local_gpg_key;
+  guint             local_url_set            : 1;
+  guint             local_collection_id_set  : 1;
+  guint             local_title_set          : 1;
+  guint             local_default_branch_set : 1;
+  guint             local_gpg_verify_set     : 1;
+  guint             local_noenumerate_set    : 1;
+  guint             local_nodeps_set         : 1;
+  guint             local_disabled_set       : 1;
+  guint             local_prio_set           : 1;
+
+  GBytes           *local_gpg_key;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (FlatpakRemote, flatpak_remote, G_TYPE_OBJECT)
@@ -506,7 +506,7 @@ flatpak_remote_get_noenumerate (FlatpakRemote *self)
  */
 void
 flatpak_remote_set_noenumerate (FlatpakRemote *self,
-                                gboolean noenumerate)
+                                gboolean       noenumerate)
 {
   FlatpakRemotePrivate *priv = flatpak_remote_get_instance_private (self);
 
@@ -549,7 +549,7 @@ flatpak_remote_get_nodeps (FlatpakRemote *self)
  */
 void
 flatpak_remote_set_nodeps (FlatpakRemote *self,
-                           gboolean nodeps)
+                           gboolean       nodeps)
 {
   FlatpakRemotePrivate *priv = flatpak_remote_get_instance_private (self);
 
@@ -591,7 +591,7 @@ flatpak_remote_get_disabled (FlatpakRemote *self)
  */
 void
 flatpak_remote_set_disabled (FlatpakRemote *self,
-                             gboolean disabled)
+                             gboolean       disabled)
 {
   FlatpakRemotePrivate *priv = flatpak_remote_get_instance_private (self);
 
@@ -634,7 +634,7 @@ flatpak_remote_get_prio (FlatpakRemote *self)
  */
 void
 flatpak_remote_set_prio (FlatpakRemote *self,
-                         int prio)
+                         int            prio)
 {
   FlatpakRemotePrivate *priv = flatpak_remote_get_instance_private (self);
 
@@ -682,7 +682,7 @@ flatpak_remote_get_gpg_verify (FlatpakRemote *self)
  */
 void
 flatpak_remote_set_gpg_verify (FlatpakRemote *self,
-                               gboolean gpg_verify)
+                               gboolean       gpg_verify)
 {
   FlatpakRemotePrivate *priv = flatpak_remote_get_instance_private (self);
 
@@ -781,14 +781,15 @@ flatpak_remote_new (const char *name)
 }
 
 gboolean
-flatpak_remote_commit (FlatpakRemote   *self,
-                       FlatpakDir      *dir,
-                       GCancellable    *cancellable,
-                       GError         **error)
+flatpak_remote_commit (FlatpakRemote *self,
+                       FlatpakDir    *dir,
+                       GCancellable  *cancellable,
+                       GError       **error)
 {
   FlatpakRemotePrivate *priv = flatpak_remote_get_instance_private (self);
   OstreeRepo *repo;
   g_autofree char *url = NULL;
+
   g_autoptr(GKeyFile) config = NULL;
   g_autofree char *group = g_strdup_printf ("remote \"%s\"", priv->name);
 
diff --git a/common/flatpak-remote.h b/common/flatpak-remote.h
index 26fd26e3..2f834d91 100644
--- a/common/flatpak-remote.h
+++ b/common/flatpak-remote.h
@@ -33,8 +33,7 @@
  *
  * Different types of @FlatpakRemote.
  */
-typedef enum
-{
+typedef enum {
   FLATPAK_REMOTE_TYPE_STATIC,
   FLATPAK_REMOTE_TYPE_USB,
   FLATPAK_REMOTE_TYPE_LAN,
diff --git a/common/flatpak-run-private.h b/common/flatpak-run-private.h
index 12510997..e8b70791 100644
--- a/common/flatpak-run-private.h
+++ b/common/flatpak-run-private.h
@@ -103,27 +103,29 @@ gboolean flatpak_run_in_transient_unit (const char *app_id,
 #define FLATPAK_METADATA_KEY_REF "ref"
 #define FLATPAK_METADATA_KEY_TAG "tag"
 
-gboolean  flatpak_run_add_extension_args (FlatpakBwrap   *bwrap,
+gboolean  flatpak_run_add_extension_args (FlatpakBwrap *bwrap,
                                           GKeyFile     *metakey,
                                           const char   *full_ref,
                                           gboolean      use_ld_so_cache,
                                           char        **extensions_out,
                                           GCancellable *cancellable,
                                           GError      **error);
-gboolean flatpak_run_add_environment_args (FlatpakBwrap   *bwrap,
-                                           const char     *app_info_path,
-                                           FlatpakRunFlags flags,
-                                           const char     *app_id,
-                                           FlatpakContext *context,
-                                           GFile          *app_id_dir,
+gboolean flatpak_run_add_environment_args (FlatpakBwrap    *bwrap,
+                                           const char      *app_info_path,
+                                           FlatpakRunFlags  flags,
+                                           const char      *app_id,
+                                           FlatpakContext  *context,
+                                           GFile           *app_id_dir,
                                            FlatpakExports **exports_out,
-                                           GCancellable *cancellable,
-                                           GError      **error);
-char **  flatpak_run_get_minimal_env (gboolean devel, gboolean use_ld_so_cache);
-void     flatpak_run_apply_env_default (FlatpakBwrap *bwrap, gboolean use_ld_so_cache);
+                                           GCancellable    *cancellable,
+                                           GError         **error);
+char **  flatpak_run_get_minimal_env (gboolean devel,
+                                      gboolean use_ld_so_cache);
+void     flatpak_run_apply_env_default (FlatpakBwrap *bwrap,
+                                        gboolean      use_ld_so_cache);
 void     flatpak_run_apply_env_appid (FlatpakBwrap *bwrap,
-                                      GFile *app_dir);
-void      flatpak_run_apply_env_vars (FlatpakBwrap *bwrap,
+                                      GFile        *app_dir);
+void      flatpak_run_apply_env_vars (FlatpakBwrap   *bwrap,
                                       FlatpakContext *context);
 FlatpakContext *flatpak_app_compute_permissions (GKeyFile *app_metadata,
                                                  GKeyFile *runtime_metadata,
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index 14bc2816..b557dcb6 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -153,7 +153,7 @@ write_xauth (char *number, FILE *output)
 
 static void
 flatpak_run_add_x11_args (FlatpakBwrap *bwrap,
-                          gboolean allowed)
+                          gboolean      allowed)
 {
   g_autofree char *x11_socket = NULL;
   const char *display;
@@ -253,7 +253,7 @@ flatpak_run_add_wayland_args (FlatpakBwrap *bwrap)
 }
 
 static void
-flatpak_run_add_ssh_args(FlatpakBwrap *bwrap)
+flatpak_run_add_ssh_args (FlatpakBwrap *bwrap)
 {
   const char * auth_socket;
   g_autofree char * sandbox_auth_socket = NULL;
@@ -266,11 +266,11 @@ flatpak_run_add_ssh_args(FlatpakBwrap *bwrap)
   if (!g_file_test (auth_socket, G_FILE_TEST_EXISTS))
     {
       /* Let's clean it up, so that the application will not try to connect */
-      flatpak_bwrap_unset_env(bwrap, "SSH_AUTH_SOCK");
+      flatpak_bwrap_unset_env (bwrap, "SSH_AUTH_SOCK");
       return;
     }
 
-  sandbox_auth_socket = g_strdup_printf ("/run/user/%d/ssh-auth", getuid());
+  sandbox_auth_socket = g_strdup_printf ("/run/user/%d/ssh-auth", getuid ());
 
   flatpak_bwrap_add_args (bwrap,
                           "--bind", auth_socket, sandbox_auth_socket,
@@ -295,7 +295,7 @@ flatpak_run_get_pulseaudio_server_user_config (const char *path)
       return NULL;
     }
 
-  data_stream = g_data_input_stream_new (G_INPUT_STREAM(input_stream));
+  data_stream = g_data_input_stream_new (G_INPUT_STREAM (input_stream));
 
   while (TRUE)
     {
@@ -310,7 +310,7 @@ flatpak_run_get_pulseaudio_server_user_config (const char *path)
 
       if (g_str_has_prefix (line, ".include "))
         {
-          g_autofree char *rec_path = g_strdup (line+9);
+          g_autofree char *rec_path = g_strdup (line + 9);
           g_strstrip (rec_path);
           char *found = flatpak_run_get_pulseaudio_server_user_config (rec_path);
           if (found)
@@ -330,7 +330,7 @@ flatpak_run_get_pulseaudio_server_user_config (const char *path)
               if (strcmp ("default-server", tokens[0]) == 0)
                 {
                   g_strstrip (tokens[1]);
-                  g_debug("Found pulseaudio socket from configuration file '%s': %s", path, tokens[1]);
+                  g_debug ("Found pulseaudio socket from configuration file '%s': %s", path, tokens[1]);
                   return g_strdup (tokens[1]);
                 }
             }
@@ -343,7 +343,7 @@ flatpak_run_get_pulseaudio_server_user_config (const char *path)
 static char *
 flatpak_run_get_pulseaudio_server (void)
 {
-  const char* pulse_clientconfig;
+  const char * pulse_clientconfig;
   char *pulse_server;
   g_autofree char *pulse_user_config = NULL;
 
@@ -355,7 +355,7 @@ flatpak_run_get_pulseaudio_server (void)
   if (pulse_clientconfig)
     return flatpak_run_get_pulseaudio_server_user_config (pulse_clientconfig);
 
-  pulse_user_config = g_build_filename (g_get_user_config_dir(), "pulse/client.conf", NULL);
+  pulse_user_config = g_build_filename (g_get_user_config_dir (), "pulse/client.conf", NULL);
   pulse_server = flatpak_run_get_pulseaudio_server_user_config (pulse_user_config);
   if (pulse_server)
     return pulse_server;
@@ -378,13 +378,13 @@ flatpak_run_parse_pulse_server (const char *value)
       const char *server = servers[i];
       if (g_str_has_prefix (server, "{"))
         {
-          const char* closing = strstr (server, "}");
+          const char * closing = strstr (server, "}");
           if (closing == NULL)
             continue;
           server = closing + 1;
         }
       if (g_str_has_prefix (server, "unix:"))
-        return g_strdup (server+5);
+        return g_strdup (server + 5);
     }
 
   return NULL;
@@ -673,10 +673,11 @@ flatpak_run_add_a11y_dbus_args (FlatpakBwrap   *app_bwrap,
    taken from app_info_path */
 static gboolean
 add_bwrap_wrapper (FlatpakBwrap *bwrap,
-                   const char *app_info_path,
-                   GError **error)
+                   const char   *app_info_path,
+                   GError      **error)
 {
   glnx_autofd int app_info_fd = -1;
+
   g_auto(GLnxDirFdIterator) dir_iter = { 0 };
   struct dirent *dent;
   g_autofree char *proxy_socket_dir = g_build_filename (g_get_user_runtime_dir (), ".dbus-proxy/", NULL);
@@ -752,14 +753,15 @@ add_bwrap_wrapper (FlatpakBwrap *bwrap,
 }
 
 static gboolean
-start_dbus_proxy (FlatpakBwrap   *app_bwrap,
-                  FlatpakBwrap   *proxy_arg_bwrap,
-                  const char *app_info_path,
-                  GError   **error)
+start_dbus_proxy (FlatpakBwrap *app_bwrap,
+                  FlatpakBwrap *proxy_arg_bwrap,
+                  const char   *app_info_path,
+                  GError      **error)
 {
   char x = 'x';
   const char *proxy;
   g_autofree char *commandline = NULL;
+
   g_autoptr(FlatpakBwrap) proxy_bwrap = NULL;
   int sync_fds[2] = {-1, -1};
   int proxy_start_index;
@@ -824,8 +826,8 @@ start_dbus_proxy (FlatpakBwrap   *app_bwrap,
 }
 
 static int
-flatpak_extension_compare_by_path (gconstpointer  _a,
-                                   gconstpointer  _b)
+flatpak_extension_compare_by_path (gconstpointer _a,
+                                   gconstpointer _b)
 {
   const FlatpakExtension *a = _a;
   const FlatpakExtension *b = _b;
@@ -834,7 +836,7 @@ flatpak_extension_compare_by_path (gconstpointer  _a,
 }
 
 gboolean
-flatpak_run_add_extension_args (FlatpakBwrap   *bwrap,
+flatpak_run_add_extension_args (FlatpakBwrap *bwrap,
                                 GKeyFile     *metakey,
                                 const char   *full_ref,
                                 gboolean      use_ld_so_cache,
@@ -988,7 +990,7 @@ flatpak_run_add_extension_args (FlatpakBwrap   *bwrap,
             }
         }
 
-      flatpak_bwrap_set_env (bwrap, "LD_LIBRARY_PATH", ld_library_path->str , TRUE);
+      flatpak_bwrap_set_env (bwrap, "LD_LIBRARY_PATH", ld_library_path->str, TRUE);
     }
 
   if (extensions_out)
@@ -998,15 +1000,15 @@ flatpak_run_add_extension_args (FlatpakBwrap   *bwrap,
 }
 
 gboolean
-flatpak_run_add_environment_args (FlatpakBwrap   *bwrap,
-                                  const char     *app_info_path,
-                                  FlatpakRunFlags flags,
-                                  const char     *app_id,
-                                  FlatpakContext *context,
-                                  GFile          *app_id_dir,
+flatpak_run_add_environment_args (FlatpakBwrap    *bwrap,
+                                  const char      *app_info_path,
+                                  FlatpakRunFlags  flags,
+                                  const char      *app_id,
+                                  FlatpakContext  *context,
+                                  GFile           *app_id_dir,
                                   FlatpakExports **exports_out,
-                                  GCancellable   *cancellable,
-                                  GError        **error)
+                                  GCancellable    *cancellable,
+                                  GError         **error)
 {
   g_autoptr(GError) my_error = NULL;
   g_autoptr(FlatpakExports) exports = NULL;
@@ -1014,7 +1016,7 @@ flatpak_run_add_environment_args (FlatpakBwrap   *bwrap,
   gboolean has_wayland = FALSE;
   gboolean allow_x11 = FALSE;
 
- if ((context->shares & FLATPAK_CONTEXT_SHARED_IPC) == 0)
+  if ((context->shares & FLATPAK_CONTEXT_SHARED_IPC) == 0)
     {
       g_debug ("Disallowing ipc access");
       flatpak_bwrap_add_args (bwrap, "--unshare-ipc", NULL);
@@ -1053,7 +1055,7 @@ flatpak_run_add_environment_args (FlatpakBwrap   *bwrap,
             "/dev/nvidia-modeset",
           };
 
-          for (i = 0; i < G_N_ELEMENTS(dri_devices); i++)
+          for (i = 0; i < G_N_ELEMENTS (dri_devices); i++)
             {
               if (g_file_test (dri_devices[i], G_FILE_TEST_EXISTS))
                 flatpak_bwrap_add_args (bwrap, "--dev-bind", dri_devices[i], dri_devices[i], NULL);
@@ -1083,9 +1085,10 @@ flatpak_run_add_environment_args (FlatpakBwrap   *bwrap,
 
   flatpak_run_add_x11_args (bwrap, allow_x11);
 
-  if (context->sockets & FLATPAK_CONTEXT_SOCKET_SSH_AUTH) {
-    flatpak_run_add_ssh_args (bwrap);
-  }
+  if (context->sockets & FLATPAK_CONTEXT_SOCKET_SSH_AUTH)
+    {
+      flatpak_run_add_ssh_args (bwrap);
+    }
 
   if (context->sockets & FLATPAK_CONTEXT_SOCKET_PULSEAUDIO)
     {
@@ -1126,7 +1129,8 @@ flatpak_run_add_environment_args (FlatpakBwrap   *bwrap,
   return TRUE;
 }
 
-typedef struct {
+typedef struct
+{
   const char *env;
   const char *val;
 } ExportData;
@@ -1164,9 +1168,9 @@ static const ExportData devel_exports[] = {
 };
 
 static void
-add_exports (GPtrArray *env_array,
+add_exports (GPtrArray        *env_array,
              const ExportData *exports,
-             gsize n_exports)
+             gsize             n_exports)
 {
   int i;
 
@@ -1247,9 +1251,9 @@ flatpak_run_get_minimal_env (gboolean devel, gboolean use_ld_so_cache)
 }
 
 static char **
-apply_exports (char **envp,
+apply_exports (char            **envp,
                const ExportData *exports,
-               gsize n_exports)
+               gsize             n_exports)
 {
   int i;
 
@@ -1277,7 +1281,7 @@ flatpak_run_apply_env_default (FlatpakBwrap *bwrap, gboolean use_ld_so_cache)
 
 void
 flatpak_run_apply_env_appid (FlatpakBwrap *bwrap,
-                             GFile *app_dir)
+                             GFile        *app_dir)
 {
   g_autoptr(GFile) app_dir_data = NULL;
   g_autoptr(GFile) app_dir_config = NULL;
@@ -1569,6 +1573,7 @@ static void
 flatpak_run_gc_ids (void)
 {
   g_autofree char *base_dir = g_build_filename (g_get_user_runtime_dir (), ".flatpak", NULL);
+
   g_auto(GLnxDirFdIterator) iter = { 0 };
   struct dirent *dent;
 
@@ -1682,6 +1687,7 @@ flatpak_run_add_app_info_args (FlatpakBwrap   *bwrap,
 {
   g_autofree char *tmp_path = NULL;
   int fd, fd2;
+
   g_autoptr(GKeyFile) keyfile = NULL;
   g_autofree char *runtime_path = NULL;
   g_autofree char *old_dest = g_strdup_printf ("/run/user/%d/flatpak-info", getuid ());
@@ -1795,7 +1801,7 @@ flatpak_run_add_app_info_args (FlatpakBwrap   *bwrap,
         {
           g_key_file_set_string_list (keyfile, FLATPAK_METADATA_GROUP_INSTANCE,
                                       FLATPAK_METADATA_KEY_EXTRA_ARGS,
-                                      (const char * const *)cmdline_args->pdata,
+                                      (const char * const *) cmdline_args->pdata,
                                       cmdline_args->len);
         }
     }
@@ -1814,7 +1820,7 @@ flatpak_run_add_app_info_args (FlatpakBwrap   *bwrap,
      .flatpak-info will be empty. We fix this by first creating a real file
      with the real info in, then bind-mounting on top of that, the same info.
      This way even if the bind-mount is unmounted we can find the real data.
-  */
+   */
 
   fd = open (tmp_path, O_RDONLY);
   if (fd == -1)
@@ -1852,7 +1858,7 @@ flatpak_run_add_app_info_args (FlatpakBwrap   *bwrap,
 }
 
 static void
-add_monitor_path_args (gboolean use_session_helper,
+add_monitor_path_args (gboolean      use_session_helper,
                        FlatpakBwrap *bwrap)
 {
   g_autoptr(AutoFlatpakSessionHelper) session_helper = NULL;
@@ -1895,10 +1901,10 @@ add_monitor_path_args (gboolean use_session_helper,
                                            trusted_module_contents, -1,
                                            "/etc/pkcs11/modules/p11-kit-trust.module", NULL))
             {
-             flatpak_bwrap_add_args (bwrap,
-                                     "--ro-bind", pkcs11_socket_path, sandbox_pkcs11_socket_path,
-                                     NULL);
-             flatpak_bwrap_unset_env (bwrap, "P11_KIT_SERVER_ADDRESS");
+              flatpak_bwrap_add_args (bwrap,
+                                      "--ro-bind", pkcs11_socket_path, sandbox_pkcs11_socket_path,
+                                      NULL);
+              flatpak_bwrap_unset_env (bwrap, "P11_KIT_SERVER_ADDRESS");
             }
         }
     }
@@ -1962,8 +1968,8 @@ add_monitor_path_args (gboolean use_session_helper,
 
 static void
 add_document_portal_args (FlatpakBwrap *bwrap,
-                          const char  *app_id,
-                          char       **out_mount_path)
+                          const char   *app_id,
+                          char        **out_mount_path)
 {
   g_autoptr(GDBusConnection) session_bus = NULL;
   g_autofree char *doc_mount_path = NULL;
@@ -2030,14 +2036,15 @@ cleanup_seccomp (void *p)
 }
 
 static gboolean
-setup_seccomp (FlatpakBwrap *bwrap,
-               const char *arch,
-               gulong      allowed_personality,
+setup_seccomp (FlatpakBwrap   *bwrap,
+               const char     *arch,
+               gulong          allowed_personality,
                FlatpakRunFlags run_flags,
-               GError    **error)
+               GError        **error)
 {
   gboolean multiarch = (run_flags & FLATPAK_RUN_FLAG_MULTIARCH) != 0;
   gboolean devel = (run_flags & FLATPAK_RUN_FLAG_DEVEL) != 0;
+
   __attribute__((cleanup (cleanup_seccomp))) scmp_filter_ctx seccomp = NULL;
 
   /**** BEGIN NOTE ON CODE SHARING
@@ -2105,7 +2112,7 @@ setup_seccomp (FlatpakBwrap *bwrap,
     {SCMP_SYS (clone), &SCMP_A0 (SCMP_CMP_MASKED_EQ, CLONE_NEWUSER, CLONE_NEWUSER)},
 
     /* Don't allow faking input to the controlling tty (CVE-2017-5226) */
-    {SCMP_SYS (ioctl), &SCMP_A1(SCMP_CMP_EQ, (int)TIOCSTI)},
+    {SCMP_SYS (ioctl), &SCMP_A1 (SCMP_CMP_EQ, (int) TIOCSTI)},
   };
 
   struct
@@ -2118,12 +2125,13 @@ setup_seccomp (FlatpakBwrap *bwrap,
      */
     {SCMP_SYS (perf_event_open)},
     /* Don't allow you to switch to bsd emulation or whatnot */
-    {SCMP_SYS (personality), &SCMP_A0(SCMP_CMP_NE, allowed_personality)},
+    {SCMP_SYS (personality), &SCMP_A0 (SCMP_CMP_NE, allowed_personality)},
     {SCMP_SYS (ptrace)}
   };
   /* Blacklist all but unix, inet, inet6 and netlink */
-  struct {
-    int family;
+  struct
+  {
+    int             family;
     FlatpakRunFlags flags_mask;
   } socket_family_whitelist[] = {
     /* NOTE: Keep in numerical order */
@@ -2265,7 +2273,7 @@ setup_seccomp (FlatpakBwrap *bwrap,
 
 static void
 flatpak_run_setup_usr_links (FlatpakBwrap *bwrap,
-                             GFile          *runtime_files)
+                             GFile        *runtime_files)
 {
   const char *usr_links[] = {"lib", "lib32", "lib64", "bin", "sbin"};
   int i;
@@ -2308,7 +2316,7 @@ flatpak_run_setup_base_argv (FlatpakBwrap   *bwrap,
 
   g = getgrgid (gid);
   if(g == NULL)
-      return flatpak_fail (error, "Invalid gid: %d", gid);
+    return flatpak_fail (error, "Invalid gid: %d", gid);
 
   run_dir = g_strdup_printf ("/run/user/%d", getuid ());
 
@@ -2464,14 +2472,15 @@ flatpak_run_setup_base_argv (FlatpakBwrap   *bwrap,
 }
 
 static gboolean
-forward_file (XdpDbusDocuments  *documents,
-              const char        *app_id,
-              const char        *file,
-              char             **out_doc_id,
-              GError           **error)
+forward_file (XdpDbusDocuments *documents,
+              const char       *app_id,
+              const char       *file,
+              char            **out_doc_id,
+              GError          **error)
 {
   int fd, fd_id;
   g_autofree char *doc_id = NULL;
+
   g_autoptr(GUnixFDList) fd_list = NULL;
   const char *perms[] = { "read", "write", NULL };
 
@@ -2511,7 +2520,7 @@ static gboolean
 add_rest_args (FlatpakBwrap   *bwrap,
                const char     *app_id,
                FlatpakExports *exports,
-               gboolean       file_forwarding,
+               gboolean        file_forwarding,
                const char     *doc_mount_path,
                char           *args[],
                int             n_args,
@@ -2563,7 +2572,7 @@ add_rest_args (FlatpakBwrap   *bwrap,
             {
               if (g_str_has_prefix (args[i], "file:"))
                 file = g_file_new_for_uri (args[i]);
-              else if (G_IS_DIR_SEPARATOR(args[i][0]))
+              else if (G_IS_DIR_SEPARATOR (args[i][0]))
                 file = g_file_new_for_path (args[i]);
             }
           else
@@ -2603,7 +2612,7 @@ add_rest_args (FlatpakBwrap   *bwrap,
 
 FlatpakContext *
 flatpak_context_load_for_deploy (FlatpakDeploy *deploy,
-                                 GError        **error)
+                                 GError       **error)
 {
   g_autoptr(FlatpakContext) context = NULL;
   g_autoptr(FlatpakContext) overrides = NULL;
@@ -2621,10 +2630,11 @@ flatpak_context_load_for_deploy (FlatpakDeploy *deploy,
 }
 
 FlatpakContext *
-flatpak_context_load_for_app (const char     *app_id,
-                              GError        **error)
+flatpak_context_load_for_app (const char *app_id,
+                              GError    **error)
 {
   g_autofree char *app_ref = NULL;
+
   g_autoptr(FlatpakDeploy) app_deploy = NULL;
 
   app_ref = flatpak_find_current_ref (app_id, NULL, error);
@@ -2639,26 +2649,26 @@ flatpak_context_load_for_app (const char     *app_id,
 }
 
 static char *
-calculate_ld_cache_checksum (GVariant *app_deploy_data,
-                             GVariant *runtime_deploy_data,
+calculate_ld_cache_checksum (GVariant   *app_deploy_data,
+                             GVariant   *runtime_deploy_data,
                              const char *app_extensions,
                              const char *runtime_extensions)
 {
   g_autoptr(GChecksum) ld_so_checksum = g_checksum_new (G_CHECKSUM_SHA256);
   if (app_deploy_data)
-    g_checksum_update (ld_so_checksum, (guchar *)flatpak_deploy_data_get_commit (app_deploy_data), -1);
-  g_checksum_update (ld_so_checksum, (guchar *)flatpak_deploy_data_get_commit (runtime_deploy_data), -1);
+    g_checksum_update (ld_so_checksum, (guchar *) flatpak_deploy_data_get_commit (app_deploy_data), -1);
+  g_checksum_update (ld_so_checksum, (guchar *) flatpak_deploy_data_get_commit (runtime_deploy_data), -1);
   if (app_extensions)
-    g_checksum_update (ld_so_checksum, (guchar *)app_extensions, -1);
+    g_checksum_update (ld_so_checksum, (guchar *) app_extensions, -1);
   if (runtime_extensions)
-    g_checksum_update (ld_so_checksum, (guchar *)runtime_extensions, -1);
+    g_checksum_update (ld_so_checksum, (guchar *) runtime_extensions, -1);
 
   return g_strdup (g_checksum_get_string (ld_so_checksum));
 }
 
 static gboolean
-add_ld_so_conf (FlatpakBwrap   *bwrap,
-                GError        **error)
+add_ld_so_conf (FlatpakBwrap *bwrap,
+                GError      **error)
 {
   const char *contents =
     "include /run/flatpak/ld.so.conf.d/app-*.conf\n"
@@ -2671,14 +2681,14 @@ add_ld_so_conf (FlatpakBwrap   *bwrap,
 }
 
 static int
-regenerate_ld_cache (GPtrArray      *base_argv_array,
-                     GArray         *base_fd_array,
-                     GFile          *app_id_dir,
-                     const char     *checksum,
-                     GFile          *runtime_files,
-                     gboolean        generate_ld_so_conf,
-                     GCancellable   *cancellable,
-                     GError        **error)
+regenerate_ld_cache (GPtrArray    *base_argv_array,
+                     GArray       *base_fd_array,
+                     GFile        *app_id_dir,
+                     const char   *checksum,
+                     GFile        *runtime_files,
+                     gboolean      generate_ld_so_conf,
+                     GCancellable *cancellable,
+                     GError      **error)
 {
   g_autoptr(FlatpakBwrap) bwrap = NULL;
   g_autoptr(GArray) combined_fd_array = NULL;
@@ -2761,7 +2771,7 @@ regenerate_ld_cache (GPtrArray      *base_argv_array,
                      error))
     return -1;
 
-  if (!WIFEXITED(exit_status) || WEXITSTATUS(exit_status) != 0)
+  if (!WIFEXITED (exit_status) || WEXITSTATUS (exit_status) != 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
                    _("ldconfig failed, exit status %d"), exit_status);
diff --git a/common/flatpak-transaction.c b/common/flatpak-transaction.c
index aed83910..4b0aac0e 100644
--- a/common/flatpak-transaction.c
+++ b/common/flatpak-transaction.c
@@ -49,67 +49,70 @@
 /* This is an internal-only element of FlatpakTransactionOperationType */
 #define FLATPAK_TRANSACTION_OPERATION_INSTALL_OR_UPDATE FLATPAK_TRANSACTION_OPERATION_LAST_TYPE + 1
 
-struct _FlatpakTransactionOperation {
-  GObject parent;
+struct _FlatpakTransactionOperation
+{
+  GObject                         parent;
 
-  char *remote;
-  char *ref;
+  char                           *remote;
+  char                           *ref;
   /* NULL means unspecified (normally keep whatever was there before), [] means force everything */
-  char **subpaths;
-  char *commit;
-  GFile *bundle;
-  GBytes *external_metadata;
+  char                          **subpaths;
+  char                           *commit;
+  GFile                          *bundle;
+  GBytes                         *external_metadata;
   FlatpakTransactionOperationType kind;
-  gboolean non_fatal;
-  gboolean failed;
-  gboolean skip;
-
-  gboolean resolved;
-  char *resolved_commit;
-  GBytes *resolved_metadata;
-  GKeyFile *resolved_metakey;
-  GBytes *resolved_old_metadata;
-  GKeyFile *resolved_old_metakey;
-  int run_after_count;
-  int run_after_prio; /* Higher => run later (when it becomes runnable). Used to run related ops (runtime extensions) before deps (apps using the runtime) */
-  GList *run_before_ops;
-  FlatpakTransactionOperation *fail_if_op_fails; /* main app/runtime for related extensions, runtime for apps */
+  gboolean                        non_fatal;
+  gboolean                        failed;
+  gboolean                        skip;
+
+  gboolean                        resolved;
+  char                           *resolved_commit;
+  GBytes                         *resolved_metadata;
+  GKeyFile                       *resolved_metakey;
+  GBytes                         *resolved_old_metadata;
+  GKeyFile                       *resolved_old_metakey;
+  int                             run_after_count;
+  int                             run_after_prio; /* Higher => run later (when it becomes runnable). Used to run related ops (runtime extensions) before deps (apps using the runtime) */
+  GList                          *run_before_ops;
+  FlatpakTransactionOperation    *fail_if_op_fails; /* main app/runtime for related extensions, runtime for apps */
 };
 
 typedef struct _FlatpakTransactionPrivate FlatpakTransactionPrivate;
 
-typedef struct _BundleData BundleData;
+typedef struct _BundleData                BundleData;
 
-struct _BundleData {
-  GFile *file;
+struct _BundleData
+{
+  GFile  *file;
   GBytes *gpg_data;
 };
 
-struct _FlatpakTransactionPrivate {
-  GObject parent;
+struct _FlatpakTransactionPrivate
+{
+  GObject                      parent;
 
-  FlatpakInstallation *installation;
-  FlatpakDir *dir;
-  GHashTable *last_op_for_ref;
-  GHashTable *remote_states; /* (element-type utf8 FlatpakRemoteState) */
-  GPtrArray *extra_dependency_dirs;
-  GList *ops;
-  GPtrArray *added_origin_remotes;
+  FlatpakInstallation         *installation;
+  FlatpakDir                  *dir;
+  GHashTable                  *last_op_for_ref;
+  GHashTable                  *remote_states; /* (element-type utf8 FlatpakRemoteState) */
+  GPtrArray                   *extra_dependency_dirs;
+  GList                       *ops;
+  GPtrArray                   *added_origin_remotes;
 
-  GList *flatpakrefs; /* GKeyFiles */
-  GList *bundles; /* BundleData */
+  GList                       *flatpakrefs; /* GKeyFiles */
+  GList                       *bundles; /* BundleData */
 
   FlatpakTransactionOperation *current_op;
 
-  gboolean no_pull;
-  gboolean no_deploy;
-  gboolean disable_static_deltas;
-  gboolean disable_prune;
-  gboolean disable_deps;
-  gboolean disable_related;
-  gboolean reinstall;
-  gboolean force_uninstall;
-  char *default_arch;
+  gboolean                     no_pull;
+  gboolean                     no_deploy;
+  gboolean                     disable_static_deltas;
+  gboolean                     disable_prune;
+  gboolean                     disable_deps;
+  gboolean                     disable_related;
+  gboolean                     reinstall;
+  gboolean                     force_uninstall;
+  char                        *default_arch;
 };
 
 enum {
@@ -128,15 +131,16 @@ enum {
   PROP_INSTALLATION,
 };
 
-struct _FlatpakTransactionProgress {
-  GObject parent;
+struct _FlatpakTransactionProgress
+{
+  GObject              parent;
 
   OstreeAsyncProgress *ostree_progress;
-  char *status;
-  gboolean estimating;
-  int progress;
+  char                *status;
+  gboolean             estimating;
+  int                  progress;
 
-  gboolean done;
+  gboolean             done;
 };
 
 enum {
@@ -145,7 +149,7 @@ enum {
 };
 
 static BundleData *
-bundle_data_new (GFile *file,
+bundle_data_new (GFile  *file,
                  GBytes *gpg_data)
 {
   BundleData *data = g_new0 (BundleData, 1);
@@ -170,27 +174,27 @@ static guint progress_signals[LAST_SIGNAL] = { 0 };
 G_DEFINE_TYPE (FlatpakTransactionProgress, flatpak_transaction_progress, G_TYPE_OBJECT)
 
 void
-flatpak_transaction_progress_set_update_frequency (FlatpakTransactionProgress  *self,
-                                                   guint update_frequency)
+flatpak_transaction_progress_set_update_frequency (FlatpakTransactionProgress *self,
+                                                   guint                       update_frequency)
 {
   g_object_set_data (G_OBJECT (self->ostree_progress), "update-frequency", GUINT_TO_POINTER (update_frequency));
 }
 
 
 char *
-flatpak_transaction_progress_get_status (FlatpakTransactionProgress  *self)
+flatpak_transaction_progress_get_status (FlatpakTransactionProgress *self)
 {
   return g_strdup (self->status);
 }
 
 gboolean
-flatpak_transaction_progress_get_is_estimating (FlatpakTransactionProgress  *self)
+flatpak_transaction_progress_get_is_estimating (FlatpakTransactionProgress *self)
 {
   return self->estimating;
 }
 
 int
-flatpak_transaction_progress_get_progress (FlatpakTransactionProgress  *self)
+flatpak_transaction_progress_get_progress (FlatpakTransactionProgress *self)
 {
   return self->progress;
 }
@@ -269,17 +273,18 @@ flatpak_transaction_progress_new (void)
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-static void initable_iface_init       (GInitableIface      *initable_iface);
+static void initable_iface_init (GInitableIface *initable_iface);
 
 G_DEFINE_TYPE_WITH_CODE (FlatpakTransaction, flatpak_transaction, G_TYPE_OBJECT,
-                         G_ADD_PRIVATE(FlatpakTransaction)
+                         G_ADD_PRIVATE (FlatpakTransaction)
                          G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init))
 
 static gboolean
-transaction_is_local_only (FlatpakTransaction *self,
+transaction_is_local_only (FlatpakTransaction             *self,
                            FlatpakTransactionOperationType kind)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   return priv->no_pull || kind == FLATPAK_TRANSACTION_OPERATION_UNINSTALL;
 }
 
@@ -287,7 +292,7 @@ static gboolean
 remote_name_is_file (const char *remote_name)
 {
   return remote_name != NULL &&
-    g_str_has_prefix (remote_name, "file://");
+         g_str_has_prefix (remote_name, "file://");
 }
 
 /**
@@ -320,9 +325,10 @@ flatpak_transaction_add_dependency_source (FlatpakTransaction  *self,
  * (but not per-user) installations.
  */
 void
-flatpak_transaction_add_default_dependency_sources (FlatpakTransaction  *self)
+flatpak_transaction_add_default_dependency_sources (FlatpakTransaction *self)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   g_autoptr(GPtrArray) system_dirs = NULL;
   GFile *path = flatpak_dir_get_path (priv->dir);
   int i;
@@ -349,10 +355,11 @@ flatpak_transaction_add_default_dependency_sources (FlatpakTransaction  *self)
  */
 static gboolean
 ref_is_installed (FlatpakTransaction *self,
-                  const char *ref,
-                  GError **error)
+                  const char         *ref,
+                  GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   g_autoptr(GFile) deploy_dir = NULL;
   FlatpakDir *dir = priv->dir;
   int i;
@@ -396,7 +403,7 @@ G_DEFINE_TYPE (FlatpakTransactionOperation, flatpak_transaction_operation, G_TYP
 static void
 flatpak_transaction_operation_finalize (GObject *object)
 {
-  FlatpakTransactionOperation *self = (FlatpakTransactionOperation *)object;
+  FlatpakTransactionOperation *self = (FlatpakTransactionOperation *) object;
 
   g_free (self->remote);
   g_free (self->ref);
@@ -433,11 +440,11 @@ flatpak_transaction_operation_init (FlatpakTransactionOperation *self)
 }
 
 static FlatpakTransactionOperation *
-flatpak_transaction_operation_new (const char *remote,
-                                   const char *ref,
-                                   const char **subpaths,
-                                   const char *commit,
-                                   GFile *bundle,
+flatpak_transaction_operation_new (const char                     *remote,
+                                   const char                     *ref,
+                                   const char                    **subpaths,
+                                   const char                     *commit,
+                                   GFile                          *bundle,
                                    FlatpakTransactionOperationType kind)
 {
   FlatpakTransactionOperation *self;
@@ -446,7 +453,7 @@ flatpak_transaction_operation_new (const char *remote,
 
   self->remote = g_strdup (remote);
   self->ref = g_strdup (ref);
-  self->subpaths = g_strdupv ((char **)subpaths);
+  self->subpaths = g_strdupv ((char **) subpaths);
   self->commit = g_strdup (commit);
   if (bundle)
     self->bundle = g_object_ref (bundle);
@@ -456,19 +463,19 @@ flatpak_transaction_operation_new (const char *remote,
 }
 
 FlatpakTransactionOperationType
-flatpak_transaction_operation_get_operation_type (FlatpakTransactionOperation  *self)
+flatpak_transaction_operation_get_operation_type (FlatpakTransactionOperation *self)
 {
   return self->kind;
 }
 
 const char *
-flatpak_transaction_operation_get_ref (FlatpakTransactionOperation  *self)
+flatpak_transaction_operation_get_ref (FlatpakTransactionOperation *self)
 {
   return self->ref;
 }
 
 const char *
-flatpak_transaction_operation_get_remote (FlatpakTransactionOperation  *self)
+flatpak_transaction_operation_get_remote (FlatpakTransactionOperation *self)
 {
   return self->remote;
 }
@@ -482,33 +489,34 @@ flatpak_transaction_operation_get_remote (FlatpakTransactionOperation  *self)
  * Returns: (transfer none): the bundle #GFile or %NULL
  */
 GFile *
-flatpak_transaction_operation_get_bundle_path    (FlatpakTransactionOperation  *self)
+flatpak_transaction_operation_get_bundle_path (FlatpakTransactionOperation *self)
 {
   return self->bundle;
 }
 
 const char *
-flatpak_transaction_operation_get_commit (FlatpakTransactionOperation  *self)
+flatpak_transaction_operation_get_commit (FlatpakTransactionOperation *self)
 {
   return self->resolved_commit;
 }
 
 GKeyFile *
-flatpak_transaction_operation_get_metadata (FlatpakTransactionOperation  *self)
+flatpak_transaction_operation_get_metadata (FlatpakTransactionOperation *self)
 {
   return self->resolved_metakey;
 }
 
 GKeyFile *
-flatpak_transaction_operation_get_old_metadata   (FlatpakTransactionOperation  *self)
+flatpak_transaction_operation_get_old_metadata (FlatpakTransactionOperation *self)
 {
   return self->resolved_old_metakey;
 }
 
 gboolean
-flatpak_transaction_is_empty (FlatpakTransaction  *self)
+flatpak_transaction_is_empty (FlatpakTransaction *self)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   return priv->ops == NULL;
 }
 
@@ -520,12 +528,12 @@ flatpak_transaction_finalize (GObject *object)
 
   g_clear_object (&priv->installation);
 
-  g_list_free_full (priv->flatpakrefs, (GDestroyNotify)g_key_file_unref);
-  g_list_free_full (priv->bundles, (GDestroyNotify)bundle_data_free);
+  g_list_free_full (priv->flatpakrefs, (GDestroyNotify) g_key_file_unref);
+  g_list_free_full (priv->bundles, (GDestroyNotify) bundle_data_free);
   g_free (priv->default_arch);
   g_hash_table_unref (priv->last_op_for_ref);
   g_hash_table_unref (priv->remote_states);
-  g_list_free_full (priv->ops, (GDestroyNotify)g_object_unref);
+  g_list_free_full (priv->ops, (GDestroyNotify) g_object_unref);
   g_object_unref (priv->dir);
 
   g_ptr_array_unref (priv->added_origin_remotes);
@@ -601,11 +609,11 @@ flatpak_transaction_ready (FlatpakTransaction *transaction)
 }
 
 static gboolean
-flatpak_transaction_add_new_remote (FlatpakTransaction *transaction,
+flatpak_transaction_add_new_remote (FlatpakTransaction            *transaction,
                                     FlatpakTransactionRemoteReason reason,
-                                    const char *from_id,
-                                    const char *suggested_remote_name,
-                                    const char *url)
+                                    const char                    *from_id,
+                                    const char                    *suggested_remote_name,
+                                    const char                    *url)
 {
   return FALSE;
 }
@@ -627,7 +635,7 @@ flatpak_transaction_class_init (FlatpakTransactionClass *klass)
                                                         "Installation",
                                                         "The installation instance",
                                                         FLATPAK_TYPE_INSTALLATION,
-                                                        G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY|G_PARAM_STATIC_STRINGS));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
   /**
    * FlatpakTransaction::new-operation:
@@ -763,19 +771,20 @@ flatpak_transaction_init (FlatpakTransaction *self)
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
 
   priv->last_op_for_ref = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-  priv->remote_states = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify)flatpak_remote_state_free);
+  priv->remote_states = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) flatpak_remote_state_free);
   priv->added_origin_remotes = g_ptr_array_new_with_free_func (g_free);
   priv->extra_dependency_dirs = g_ptr_array_new_with_free_func (g_object_unref);
 }
 
 
 static gboolean
-initable_init (GInitable     *initable,
-               GCancellable  *cancellable,
-               GError       **error)
+initable_init (GInitable    *initable,
+               GCancellable *cancellable,
+               GError      **error)
 {
   FlatpakTransaction *self = FLATPAK_TRANSACTION (initable);
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   g_autoptr(FlatpakDir) dir = NULL;
 
   if (priv->installation == NULL)
@@ -822,8 +831,8 @@ flatpak_transaction_new_for_installation (FlatpakInstallation *installation,
 }
 
 void
-flatpak_transaction_set_no_pull (FlatpakTransaction  *self,
-                                 gboolean             no_pull)
+flatpak_transaction_set_no_pull (FlatpakTransaction *self,
+                                 gboolean            no_pull)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
 
@@ -831,73 +840,81 @@ flatpak_transaction_set_no_pull (FlatpakTransaction  *self,
 }
 
 void
-flatpak_transaction_set_no_deploy (FlatpakTransaction  *self,
-                                   gboolean             no_deploy)
+flatpak_transaction_set_no_deploy (FlatpakTransaction *self,
+                                   gboolean            no_deploy)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   priv->no_deploy = no_deploy;
 }
 
 void
-flatpak_transaction_set_disable_static_deltas (FlatpakTransaction  *self,
-                                               gboolean             disable_static_deltas)
+flatpak_transaction_set_disable_static_deltas (FlatpakTransaction *self,
+                                               gboolean            disable_static_deltas)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   priv->disable_static_deltas = disable_static_deltas;
 }
 
 void
-flatpak_transaction_set_disable_prune (FlatpakTransaction  *self,
-                                       gboolean             disable_prune)
+flatpak_transaction_set_disable_prune (FlatpakTransaction *self,
+                                       gboolean            disable_prune)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   priv->disable_prune = disable_prune;
 }
 
 void
-flatpak_transaction_set_disable_dependencies  (FlatpakTransaction  *self,
-                                               gboolean             disable_dependencies)
+flatpak_transaction_set_disable_dependencies (FlatpakTransaction *self,
+                                              gboolean            disable_dependencies)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   priv->disable_deps = disable_dependencies;
 }
 
 void
-flatpak_transaction_set_disable_related (FlatpakTransaction  *self,
-                                         gboolean             disable_related)
+flatpak_transaction_set_disable_related (FlatpakTransaction *self,
+                                         gboolean            disable_related)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   priv->disable_related = disable_related;
 }
 
 void
-flatpak_transaction_set_reinstall (FlatpakTransaction   *self,
-                                   gboolean             reinstall)
+flatpak_transaction_set_reinstall (FlatpakTransaction *self,
+                                   gboolean            reinstall)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   priv->reinstall = reinstall;
 }
 
 void
-flatpak_transaction_set_force_uninstall (FlatpakTransaction  *self,
-                                         gboolean             force_uninstall)
+flatpak_transaction_set_force_uninstall (FlatpakTransaction *self,
+                                         gboolean            force_uninstall)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   priv->force_uninstall = force_uninstall;
 }
 
 void
-flatpak_transaction_set_default_arch (FlatpakTransaction  *self,
-                                      const char *default_arch)
+flatpak_transaction_set_default_arch (FlatpakTransaction *self,
+                                      const char         *default_arch)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   g_free (priv->default_arch);
   priv->default_arch = g_strdup (default_arch);
 }
 
 static FlatpakTransactionOperation *
 flatpak_transaction_get_last_op_for_ref (FlatpakTransaction *self,
-                                         const char *ref)
+                                         const char         *ref)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   FlatpakTransactionOperation *op;
@@ -934,18 +951,23 @@ subpaths_to_string (const char **subpaths)
 static const char *
 kind_to_str (FlatpakTransactionOperationType kind)
 {
-  switch ((int)kind)
+  switch ((int) kind)
     {
     case FLATPAK_TRANSACTION_OPERATION_INSTALL:
       return "install";
+
     case FLATPAK_TRANSACTION_OPERATION_UPDATE:
       return "update";
+
     case FLATPAK_TRANSACTION_OPERATION_INSTALL_OR_UPDATE:
       return "install/update";
+
     case FLATPAK_TRANSACTION_OPERATION_INSTALL_BUNDLE:
       return "install bundle";
+
     case FLATPAK_TRANSACTION_OPERATION_UNINSTALL:
       return "uninstall";
+
     case FLATPAK_TRANSACTION_OPERATION_LAST_TYPE:
     default:
       return "unknown";
@@ -953,10 +975,10 @@ kind_to_str (FlatpakTransactionOperationType kind)
 }
 
 static FlatpakRemoteState *
-flatpak_transaction_ensure_remote_state (FlatpakTransaction *self,
+flatpak_transaction_ensure_remote_state (FlatpakTransaction             *self,
                                          FlatpakTransactionOperationType kind,
-                                         const char *remote,
-                                         GError **error)
+                                         const char                     *remote,
+                                         GError                        **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   FlatpakRemoteState *state;
@@ -998,12 +1020,12 @@ kind_compatible (FlatpakTransactionOperationType a,
 }
 
 static FlatpakTransactionOperation *
-flatpak_transaction_add_op (FlatpakTransaction *self,
-                            const char *remote,
-                            const char *ref,
-                            const char **subpaths,
-                            const char *commit,
-                            GFile *bundle,
+flatpak_transaction_add_op (FlatpakTransaction             *self,
+                            const char                     *remote,
+                            const char                     *ref,
+                            const char                    **subpaths,
+                            const char                     *commit,
+                            GFile                          *bundle,
                             FlatpakTransactionOperationType kind)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
@@ -1023,7 +1045,7 @@ flatpak_transaction_add_op (FlatpakTransaction *self,
       g_auto(GStrv) old_subpaths = NULL;
 
       old_subpaths = op->subpaths;
-      op->subpaths = flatpak_subpaths_merge (old_subpaths, (char **)subpaths);
+      op->subpaths = flatpak_subpaths_merge (old_subpaths, (char **) subpaths);
 
       return op;
     }
@@ -1039,7 +1061,7 @@ flatpak_transaction_add_op (FlatpakTransaction *self,
 static void
 run_operation_before (FlatpakTransactionOperation *op,
                       FlatpakTransactionOperation *before_this,
-                      int prio)
+                      int                          prio)
 {
   if (op == before_this)
     return; /* Don't cause unnecessary loops */
@@ -1049,12 +1071,13 @@ run_operation_before (FlatpakTransactionOperation *op,
 }
 
 static gboolean
-add_related (FlatpakTransaction *self,
+add_related (FlatpakTransaction          *self,
              FlatpakTransactionOperation *op,
-             GError **error)
+             GError                     **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   FlatpakRemoteState *state = NULL;
+
   g_autoptr(GPtrArray) related = NULL;
   g_autoptr(GError) local_error = NULL;
   int i;
@@ -1113,7 +1136,7 @@ add_related (FlatpakTransaction *self,
             continue;
 
           related_op = flatpak_transaction_add_op (self, op->remote, rel->ref,
-                                                   (const char **)rel->subpaths,
+                                                   (const char **) rel->subpaths,
                                                    NULL, NULL,
                                                    FLATPAK_TRANSACTION_OPERATION_INSTALL_OR_UPDATE);
           op->non_fatal = TRUE;
@@ -1126,13 +1149,14 @@ add_related (FlatpakTransaction *self,
 }
 
 static char *
-find_runtime_remote (FlatpakTransaction *self,
-                     const char *app_ref,
-                     const char *runtime_ref,
+find_runtime_remote (FlatpakTransaction             *self,
+                     const char                     *app_ref,
+                     const char                     *runtime_ref,
                      FlatpakTransactionOperationType source_kind,
-                     GError **error)
+                     GError                        **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   g_auto(GStrv) remotes = NULL;
   const char *app_pref;
   const char *runtime_pref;
@@ -1170,9 +1194,9 @@ find_runtime_remote (FlatpakTransaction *self,
 
 
 static gboolean
-add_deps (FlatpakTransaction *self,
+add_deps (FlatpakTransaction          *self,
           FlatpakTransactionOperation *op,
-          GError **error)
+          GError                     **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   g_autofree char *runtime_ref = NULL;
@@ -1249,15 +1273,15 @@ add_deps (FlatpakTransaction *self,
 }
 
 static gboolean
-flatpak_transaction_add_ref (FlatpakTransaction *self,
-                             const char *remote,
-                             const char *ref,
-                             const char **subpaths,
-                             const char *commit,
+flatpak_transaction_add_ref (FlatpakTransaction             *self,
+                             const char                     *remote,
+                             const char                     *ref,
+                             const char                    **subpaths,
+                             const char                     *commit,
                              FlatpakTransactionOperationType kind,
-                             GFile *bundle,
-                             const char *external_metadata,
-                             GError **error)
+                             GFile                          *bundle,
+                             const char                     *external_metadata,
+                             GError                        **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   g_autofree char *origin = NULL;
@@ -1351,10 +1375,10 @@ flatpak_transaction_add_ref (FlatpakTransaction *self,
 
 gboolean
 flatpak_transaction_add_install (FlatpakTransaction *self,
-                                 const char *remote,
-                                 const char *ref,
-                                 const char **subpaths,
-                                 GError **error)
+                                 const char         *remote,
+                                 const char         *ref,
+                                 const char        **subpaths,
+                                 GError            **error)
 {
   const char *all_paths[] = { NULL };
 
@@ -1367,9 +1391,9 @@ flatpak_transaction_add_install (FlatpakTransaction *self,
 
 gboolean
 flatpak_transaction_add_install_bundle (FlatpakTransaction *self,
-                                        GFile               *file,
-                                        GBytes              *gpg_data,
-                                        GError **error)
+                                        GFile              *file,
+                                        GBytes             *gpg_data,
+                                        GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
 
@@ -1380,10 +1404,11 @@ flatpak_transaction_add_install_bundle (FlatpakTransaction *self,
 
 gboolean
 flatpak_transaction_add_install_flatpakref (FlatpakTransaction *self,
-                                            GBytes              *flatpakref_data,
-                                            GError             **error)
+                                            GBytes             *flatpakref_data,
+                                            GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   g_autoptr(GKeyFile) keyfile = g_key_file_new ();
   g_autoptr(GError) local_error = NULL;
 
@@ -1399,10 +1424,10 @@ flatpak_transaction_add_install_flatpakref (FlatpakTransaction *self,
 
 gboolean
 flatpak_transaction_add_update (FlatpakTransaction *self,
-                                const char *ref,
-                                const char **subpaths,
-                                const char *commit,
-                                GError **error)
+                                const char         *ref,
+                                const char        **subpaths,
+                                const char         *commit,
+                                GError            **error)
 {
   const char *all_paths[] = { NULL };
 
@@ -1414,19 +1439,20 @@ flatpak_transaction_add_update (FlatpakTransaction *self,
 }
 
 gboolean
-flatpak_transaction_add_uninstall (FlatpakTransaction  *self,
-                                   const char          *ref,
-                                   GError             **error)
+flatpak_transaction_add_uninstall (FlatpakTransaction *self,
+                                   const char         *ref,
+                                   GError            **error)
 {
   return flatpak_transaction_add_ref (self, NULL, ref, NULL, NULL, FLATPAK_TRANSACTION_OPERATION_UNINSTALL, NULL, NULL, error);
 }
 
 static gboolean
-flatpak_transaction_update_metadata (FlatpakTransaction  *self,
-                                     GCancellable        *cancellable,
-                                     GError             **error)
+flatpak_transaction_update_metadata (FlatpakTransaction *self,
+                                     GCancellable       *cancellable,
+                                     GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   g_auto(GStrv) remotes = NULL;
   int i;
   GList *l;
@@ -1439,7 +1465,7 @@ flatpak_transaction_update_metadata (FlatpakTransaction  *self,
       FlatpakTransactionOperation *op = l->data;
       g_hash_table_add (ht, g_strdup (op->remote));
     }
-  remotes = (char **)g_hash_table_get_keys_as_array (ht, NULL);
+  remotes = (char **) g_hash_table_get_keys_as_array (ht, NULL);
   g_hash_table_steal_all (ht); /* Move ownership to remotes */
 
   /* Update metadata for said remotes */
@@ -1467,9 +1493,9 @@ emit_new_op (FlatpakTransaction *self, FlatpakTransactionOperation *op, FlatpakT
 }
 
 static void
-emit_op_done (FlatpakTransaction *self,
+emit_op_done (FlatpakTransaction          *self,
               FlatpakTransactionOperation *op,
-              FlatpakTransactionResult details)
+              FlatpakTransactionResult     details)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   g_autofree char *commit = NULL;
@@ -1490,6 +1516,7 @@ static GBytes *
 load_deployed_metadata (FlatpakTransaction *self, const char *ref)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   g_autoptr(GFile) deploy_dir = NULL;
   g_autoptr(GFile) metadata_file = NULL;
   g_autofree char *metadata_contents = NULL;
@@ -1512,9 +1539,9 @@ load_deployed_metadata (FlatpakTransaction *self, const char *ref)
 
 static void
 mark_op_resolved (FlatpakTransactionOperation *op,
-                  const char *commit,
-                  GBytes *metadata,
-                  GBytes *old_metadata)
+                  const char                  *commit,
+                  GBytes                      *metadata,
+                  GBytes                      *old_metadata)
 {
   g_debug ("marking op %s:%s resolved to %s", kind_to_str (op->kind), op->ref, commit ? commit : "-");
 
@@ -1551,12 +1578,14 @@ mark_op_resolved (FlatpakTransactionOperation *op,
 
 static gboolean
 resolve_p2p_ops (FlatpakTransaction *self,
-                 GList *p2p_ops,
-                 GCancellable *cancellable,
-                 GError **error)
+                 GList              *p2p_ops,
+                 GCancellable       *cancellable,
+                 GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
-  g_autoptr(GPtrArray) resolves = g_ptr_array_new_with_free_func ((GDestroyNotify)flatpak_dir_resolve_free);;
+
+  g_autoptr(GPtrArray) resolves = g_ptr_array_new_with_free_func ((GDestroyNotify) flatpak_dir_resolve_free);
+  ;
   GList *l;
   int i;
 
@@ -1577,7 +1606,7 @@ resolve_p2p_ops (FlatpakTransaction *self,
 
   g_ptr_array_add (resolves, NULL);
 
-  if (!flatpak_dir_resolve_p2p_refs (priv->dir, (FlatpakDirResolve **)resolves->pdata,
+  if (!flatpak_dir_resolve_p2p_refs (priv->dir, (FlatpakDirResolve **) resolves->pdata,
                                      cancellable, error))
     return FALSE;
 
@@ -1599,11 +1628,12 @@ resolve_p2p_ops (FlatpakTransaction *self,
    dependencies from it, and verify versions. */
 static gboolean
 resolve_ops (FlatpakTransaction *self,
-             GCancellable *cancellable,
-             GError **error)
+             GCancellable       *cancellable,
+             GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   GList *l;
+
   g_autoptr(GList) collection_id_ops = NULL;
 
 
@@ -1704,6 +1734,7 @@ compare_op_ref (FlatpakTransactionOperation *a, FlatpakTransactionOperation *b)
 {
   char *aa = strchr (a->ref, '/');
   char *bb = strchr (b->ref, '/');
+
   return g_strcmp0 (aa, bb);
 }
 
@@ -1741,7 +1772,7 @@ sort_ops (FlatpakTransaction *self)
     }
 
   /* If no other order, start in alphabetical ref-order */
-  runnable = g_list_sort (runnable, (GCompareFunc)compare_op_ref);
+  runnable = g_list_sort (runnable, (GCompareFunc) compare_op_ref);
 
   while (runnable)
     {
@@ -1754,7 +1785,7 @@ sort_ops (FlatpakTransaction *self)
 
       /* Then greedily run ops that become runnable, in run_after_prio order, so that
          related ops are run before depdendencies */
-      run_op->run_before_ops = g_list_sort (run_op->run_before_ops, (GCompareFunc)compare_op_prio);
+      run_op->run_before_ops = g_list_sort (run_op->run_before_ops, (GCompareFunc) compare_op_prio);
       for (l = run_op->run_before_ops; l != NULL; l = l->next)
         {
           FlatpakTransactionOperation *after_op = l->data;
@@ -1787,7 +1818,7 @@ sort_ops (FlatpakTransaction *self)
  * Returns: (transfer full) (element-type FlatpakTransactionOperation): a #GList of operations
  */
 GList *
-flatpak_transaction_get_operations (FlatpakTransaction  *self)
+flatpak_transaction_get_operations (FlatpakTransaction *self)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   GList *l;
@@ -1812,9 +1843,10 @@ flatpak_transaction_get_operations (FlatpakTransaction  *self)
  * Returns: (transfer full): the current #FlatpakTransactionOperation
  */
 FlatpakTransactionOperation *
-flatpak_transaction_get_current_operation (FlatpakTransaction  *self)
+flatpak_transaction_get_current_operation (FlatpakTransaction *self)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   return g_object_ref (priv->current_op);
 }
 
@@ -1827,16 +1859,17 @@ flatpak_transaction_get_current_operation (FlatpakTransaction  *self)
  * Returns: (transfer full): a #FlatpakInstallation
  */
 FlatpakInstallation *
-flatpak_transaction_get_installation (FlatpakTransaction  *self)
+flatpak_transaction_get_installation (FlatpakTransaction *self)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   return g_object_ref (priv->installation);
 }
 
 
 static GBytes *
-download_uri (const char     *url,
-              GError        **error)
+download_uri (const char *url,
+              GError    **error)
 {
   g_autoptr(SoupSession) session = NULL;
   g_autoptr(SoupRequest) req = NULL;
@@ -1866,8 +1899,8 @@ download_uri (const char     *url,
 
 static gboolean
 remote_is_already_configured (FlatpakTransaction *self,
-                              const char *url,
-                              const char *collection_id)
+                              const char         *url,
+                              const char         *collection_id)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   g_autofree char *old_remote = NULL;
@@ -1897,6 +1930,7 @@ handle_suggested_remote_name (FlatpakTransaction *self, GKeyFile *keyfile, GErro
   g_autofree char *name = NULL;
   g_autofree char *url = NULL;
   g_autofree char *collection_id = NULL;
+
   g_autoptr(GKeyFile) config = NULL;
   g_autoptr(GBytes) gpg_key = NULL;
   gboolean res;
@@ -1946,6 +1980,7 @@ static gboolean
 handle_runtime_repo_deps (FlatpakTransaction *self, const char *id, const char *dep_url, GError **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
+
   g_autoptr(GBytes) dep_data = NULL;
   g_autofree char *runtime_url = NULL;
   g_autofree char *new_remote = NULL;
@@ -1998,7 +2033,7 @@ handle_runtime_repo_deps (FlatpakTransaction *self, const char *id, const char *
         new_remote = g_strdup_printf ("%s-%d", basename, i);
       i++;
     }
-  while (remotes != NULL && g_strv_contains ((const char * const*)remotes, new_remote));
+  while (remotes != NULL && g_strv_contains ((const char * const *) remotes, new_remote));
 
   config = flatpak_dir_parse_repofile (priv->dir, new_remote, FALSE, dep_keyfile, &gpg_key, NULL, error);
   if (config == NULL)
@@ -2055,8 +2090,8 @@ handle_runtime_repo_deps_from_keyfile (FlatpakTransaction *self, GKeyFile *keyfi
 
 static gboolean
 flatpak_transaction_resolve_flatpakrefs (FlatpakTransaction *self,
-                                         GCancellable *cancellable,
-                                         GError **error)
+                                         GCancellable       *cancellable,
+                                         GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   GList *l;
@@ -2091,12 +2126,13 @@ flatpak_transaction_resolve_flatpakrefs (FlatpakTransaction *self,
 
 static gboolean
 handle_runtime_repo_deps_from_bundle (FlatpakTransaction *self,
-                                      GFile *file,
-                                      GError **error)
+                                      GFile              *file,
+                                      GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   g_autofree char *dep_url = NULL;
   g_autofree char *ref = NULL;
+
   g_auto(GStrv) ref_parts = NULL;
   g_autoptr(GVariant) metadata = NULL;
 
@@ -2123,8 +2159,8 @@ handle_runtime_repo_deps_from_bundle (FlatpakTransaction *self,
 
 static gboolean
 flatpak_transaction_resolve_bundles (FlatpakTransaction *self,
-                                     GCancellable *cancellable,
-                                     GError **error)
+                                     GCancellable       *cancellable,
+                                     GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   GList *l;
@@ -2163,14 +2199,15 @@ flatpak_transaction_resolve_bundles (FlatpakTransaction *self,
 
 gboolean
 flatpak_transaction_run (FlatpakTransaction *self,
-                         GCancellable *cancellable,
-                         GError **error)
+                         GCancellable       *cancellable,
+                         GError            **error)
 {
   FlatpakTransactionPrivate *priv = flatpak_transaction_get_instance_private (self);
   GList *l, *next;
   gboolean succeeded = TRUE;
   gboolean needs_prune = FALSE;
   gboolean needs_triggers = FALSE;
+
   g_autoptr(GMainContextPopDefault) main_context = NULL;
   gboolean ready_res = FALSE;
   int i;
@@ -2248,7 +2285,7 @@ flatpak_transaction_run (FlatpakTransaction *self,
       /* Skip no-op updates */
       if (op->kind == FLATPAK_TRANSACTION_OPERATION_UPDATE &&
           !flatpak_dir_needs_update_for_commit_and_subpaths (priv->dir, op->remote, op->ref, op->resolved_commit,
-                                                             (const char **)op->subpaths))
+                                                             (const char **) op->subpaths))
         op->skip = TRUE;
     }
 
@@ -2308,7 +2345,7 @@ flatpak_transaction_run (FlatpakTransaction *self,
                                        priv->disable_static_deltas,
                                        priv->reinstall,
                                        state, op->ref, op->resolved_commit,
-                                       (const char **)op->subpaths,
+                                       (const char **) op->subpaths,
                                        progress->ostree_progress,
                                        cancellable, &local_error);
 
@@ -2331,7 +2368,7 @@ flatpak_transaction_run (FlatpakTransaction *self,
           g_assert (op->resolved_commit != NULL); /* We resolved this before */
 
           if (flatpak_dir_needs_update_for_commit_and_subpaths (priv->dir, op->remote, op->ref, op->resolved_commit,
-                                                                (const char **)op->subpaths))
+                                                                (const char **) op->subpaths))
             {
               g_autoptr(FlatpakTransactionProgress) progress = flatpak_transaction_progress_new ();
               FlatpakTransactionResult result_details = 0;
@@ -2348,7 +2385,7 @@ flatpak_transaction_run (FlatpakTransaction *self,
                                           op->commit != NULL, /* Allow downgrade if we specify commit */
                                           state, op->ref, op->resolved_commit,
                                           NULL,
-                                          (const char **)op->subpaths,
+                                          (const char **) op->subpaths,
                                           progress->ostree_progress,
                                           cancellable, &local_error);
               flatpak_transaction_progress_done (progress);
diff --git a/common/flatpak-transaction.h b/common/flatpak-transaction.h
index f2185b38..040961b3 100644
--- a/common/flatpak-transaction.h
+++ b/common/flatpak-transaction.h
@@ -91,134 +91,134 @@ struct _FlatpakTransactionClass
 {
   GObjectClass parent_class;
 
-  void (*new_operation)        (FlatpakTransaction *transaction,
+  void         (*new_operation)        (FlatpakTransaction          *transaction,
+                                        FlatpakTransactionOperation *operation,
+                                        FlatpakTransactionProgress  *progress);
+  void (*operation_done)       (FlatpakTransaction          *transaction,
                                 FlatpakTransactionOperation *operation,
-                                FlatpakTransactionProgress *progress);
-  void (*operation_done)       (FlatpakTransaction *transaction,
-                                FlatpakTransactionOperation *operation,
-                                FlatpakTransactionResult details);
-  gboolean (*operation_error)  (FlatpakTransaction *transaction,
-                                FlatpakTransactionOperation *operation,
-                                const GError *error,
+                                FlatpakTransactionResult     details);
+  gboolean (*operation_error)  (FlatpakTransaction            *transaction,
+                                FlatpakTransactionOperation   *operation,
+                                const GError                  *error,
                                 FlatpakTransactionErrorDetails detail);
   int (*choose_remote_for_ref) (FlatpakTransaction *transaction,
-                                const char *for_ref,
-                                const char *runtime_ref,
+                                const char         *for_ref,
+                                const char         *runtime_ref,
                                 const char * const *remotes);
   void (*end_of_lifed)         (FlatpakTransaction *transaction,
-                                const char *ref,
-                                const char *reason,
-                                const char *rebase);
+                                const char         *ref,
+                                const char         *reason,
+                                const char         *rebase);
   gboolean (*ready)            (FlatpakTransaction *transaction);
 
-  gboolean (*add_new_remote) (FlatpakTransaction *transaction,
+  gboolean (*add_new_remote) (FlatpakTransaction            *transaction,
                               FlatpakTransactionRemoteReason reason,
-                              const char *from_id,
-                              const char *remote_name,
-                              const char *url);
+                              const char                    *from_id,
+                              const char                    *remote_name,
+                              const char                    *url);
   gpointer padding[10];
 };
 
 FLATPAK_EXTERN
-FlatpakTransaction *flatpak_transaction_new_for_installation (FlatpakInstallation          *installation,
-                                                              GCancellable                 *cancellable,
-                                                              GError                      **error);
+FlatpakTransaction *flatpak_transaction_new_for_installation (FlatpakInstallation *installation,
+                                                              GCancellable        *cancellable,
+                                                              GError             **error);
 
 FLATPAK_EXTERN
-void        flatpak_transaction_progress_set_update_frequency (FlatpakTransactionProgress  *self,
-                                                               guint update_frequency);
+void        flatpak_transaction_progress_set_update_frequency (FlatpakTransactionProgress *self,
+                                                               guint                       update_frequency);
 FLATPAK_EXTERN
-char *      flatpak_transaction_progress_get_status           (FlatpakTransactionProgress  *self);
+char *      flatpak_transaction_progress_get_status (FlatpakTransactionProgress *self);
 FLATPAK_EXTERN
-gboolean    flatpak_transaction_progress_get_is_estimating    (FlatpakTransactionProgress  *self);
+gboolean    flatpak_transaction_progress_get_is_estimating (FlatpakTransactionProgress *self);
 FLATPAK_EXTERN
-int         flatpak_transaction_progress_get_progress         (FlatpakTransactionProgress  *self);
+int         flatpak_transaction_progress_get_progress (FlatpakTransactionProgress *self);
 
 
 FLATPAK_EXTERN
-FlatpakTransactionOperationType flatpak_transaction_operation_get_operation_type (FlatpakTransactionOperation  *self);
+FlatpakTransactionOperationType flatpak_transaction_operation_get_operation_type (FlatpakTransactionOperation *self);
 FLATPAK_EXTERN
-const char *                    flatpak_transaction_operation_get_ref            (FlatpakTransactionOperation  *self);
+const char *                    flatpak_transaction_operation_get_ref (FlatpakTransactionOperation *self);
 FLATPAK_EXTERN
-const char *                    flatpak_transaction_operation_get_remote         (FlatpakTransactionOperation  *self);
+const char *                    flatpak_transaction_operation_get_remote (FlatpakTransactionOperation *self);
 FLATPAK_EXTERN
-GFile *                         flatpak_transaction_operation_get_bundle_path    (FlatpakTransactionOperation  *self);
+GFile *                         flatpak_transaction_operation_get_bundle_path (FlatpakTransactionOperation *self);
 FLATPAK_EXTERN
-const char *                    flatpak_transaction_operation_get_commit         (FlatpakTransactionOperation  *self);
+const char *                    flatpak_transaction_operation_get_commit (FlatpakTransactionOperation *self);
 FLATPAK_EXTERN
-GKeyFile *                      flatpak_transaction_operation_get_metadata       (FlatpakTransactionOperation  *self);
+GKeyFile *                      flatpak_transaction_operation_get_metadata (FlatpakTransactionOperation *self);
 FLATPAK_EXTERN
-GKeyFile *                      flatpak_transaction_operation_get_old_metadata   (FlatpakTransactionOperation  *self);
+GKeyFile *                      flatpak_transaction_operation_get_old_metadata (FlatpakTransactionOperation *self);
 
 FLATPAK_EXTERN
-void                flatpak_transaction_set_no_pull               (FlatpakTransaction  *self,
-                                                                   gboolean             no_pull);
+void                flatpak_transaction_set_no_pull (FlatpakTransaction *self,
+                                                     gboolean            no_pull);
 FLATPAK_EXTERN
-void                flatpak_transaction_set_no_deploy             (FlatpakTransaction  *self,
-                                                                   gboolean             no_deploy);
+void                flatpak_transaction_set_no_deploy (FlatpakTransaction *self,
+                                                       gboolean            no_deploy);
 FLATPAK_EXTERN
-void                flatpak_transaction_set_disable_static_deltas (FlatpakTransaction  *self,
-                                                                   gboolean             disable_static_deltas);
+void                flatpak_transaction_set_disable_static_deltas (FlatpakTransaction *self,
+                                                                   gboolean            disable_static_deltas);
 FLATPAK_EXTERN
-void                flatpak_transaction_set_disable_prune         (FlatpakTransaction  *self,
-                                                                   gboolean             disable_prune);
+void                flatpak_transaction_set_disable_prune (FlatpakTransaction *self,
+                                                           gboolean            disable_prune);
 FLATPAK_EXTERN
-void                flatpak_transaction_set_disable_dependencies  (FlatpakTransaction  *self,
-                                                                   gboolean             disable_dependencies);
+void                flatpak_transaction_set_disable_dependencies (FlatpakTransaction *self,
+                                                                  gboolean            disable_dependencies);
 FLATPAK_EXTERN
-void                flatpak_transaction_set_disable_related       (FlatpakTransaction  *self,
-                                                                   gboolean             disable_related);
+void                flatpak_transaction_set_disable_related (FlatpakTransaction *self,
+                                                             gboolean            disable_related);
 FLATPAK_EXTERN
-void                flatpak_transaction_set_reinstall             (FlatpakTransaction   *self,
-                                                                   gboolean             reinstall);
+void                flatpak_transaction_set_reinstall (FlatpakTransaction *self,
+                                                       gboolean            reinstall);
 FLATPAK_EXTERN
-void                flatpak_transaction_set_force_uninstall       (FlatpakTransaction  *self,
-                                                                   gboolean             force_uninstall);
+void                flatpak_transaction_set_force_uninstall (FlatpakTransaction *self,
+                                                             gboolean            force_uninstall);
 FLATPAK_EXTERN
-void                flatpak_transaction_set_default_arch          (FlatpakTransaction  *self,
-                                                                   const char          *arch);
+void                flatpak_transaction_set_default_arch (FlatpakTransaction *self,
+                                                          const char         *arch);
 FLATPAK_EXTERN
-void                flatpak_transaction_add_dependency_source     (FlatpakTransaction  *self,
-                                                                   FlatpakInstallation *installation);
+void                flatpak_transaction_add_dependency_source (FlatpakTransaction  *self,
+                                                               FlatpakInstallation *installation);
 FLATPAK_EXTERN
-void                flatpak_transaction_add_default_dependency_sources (FlatpakTransaction  *self);
+void                flatpak_transaction_add_default_dependency_sources (FlatpakTransaction *self);
 FLATPAK_EXTERN
-gboolean            flatpak_transaction_run                       (FlatpakTransaction  *self,
-                                                                   GCancellable        *cancellable,
-                                                                   GError             **error);
+gboolean            flatpak_transaction_run (FlatpakTransaction *self,
+                                             GCancellable       *cancellable,
+                                             GError            **error);
 FLATPAK_EXTERN
-FlatpakTransactionOperation *flatpak_transaction_get_current_operation (FlatpakTransaction  *self);
+FlatpakTransactionOperation *flatpak_transaction_get_current_operation (FlatpakTransaction *self);
 FLATPAK_EXTERN
-FlatpakInstallation *flatpak_transaction_get_installation         (FlatpakTransaction  *self);
+FlatpakInstallation *flatpak_transaction_get_installation (FlatpakTransaction *self);
 FLATPAK_EXTERN
-GList *flatpak_transaction_get_operations (FlatpakTransaction  *self);
+GList *flatpak_transaction_get_operations (FlatpakTransaction *self);
 
 FLATPAK_EXTERN
-gboolean            flatpak_transaction_add_install               (FlatpakTransaction  *self,
-                                                                   const char          *remote,
-                                                                   const char          *ref,
-                                                                   const char         **subpaths,
-                                                                   GError             **error);
+gboolean            flatpak_transaction_add_install (FlatpakTransaction *self,
+                                                     const char         *remote,
+                                                     const char         *ref,
+                                                     const char        **subpaths,
+                                                     GError            **error);
 FLATPAK_EXTERN
-gboolean            flatpak_transaction_add_install_bundle        (FlatpakTransaction  *self,
-                                                                   GFile               *file,
-                                                                   GBytes              *gpg_data,
-                                                                   GError             **error);
+gboolean            flatpak_transaction_add_install_bundle (FlatpakTransaction *self,
+                                                            GFile              *file,
+                                                            GBytes             *gpg_data,
+                                                            GError            **error);
 FLATPAK_EXTERN
-gboolean            flatpak_transaction_add_install_flatpakref    (FlatpakTransaction *self,
-                                                                   GBytes              *flatpakref_data,
-                                                                   GError             **error);
+gboolean            flatpak_transaction_add_install_flatpakref (FlatpakTransaction *self,
+                                                                GBytes             *flatpakref_data,
+                                                                GError            **error);
 FLATPAK_EXTERN
-gboolean            flatpak_transaction_add_update                (FlatpakTransaction  *self,
-                                                                   const char          *ref,
-                                                                   const char         **subpaths,
-                                                                   const char          *commit,
-                                                                   GError             **error);
+gboolean            flatpak_transaction_add_update (FlatpakTransaction *self,
+                                                    const char         *ref,
+                                                    const char        **subpaths,
+                                                    const char         *commit,
+                                                    GError            **error);
 FLATPAK_EXTERN
-gboolean            flatpak_transaction_add_uninstall             (FlatpakTransaction  *self,
-                                                                   const char          *ref,
-                                                                   GError             **error);
+gboolean            flatpak_transaction_add_uninstall (FlatpakTransaction *self,
+                                                       const char         *ref,
+                                                       GError            **error);
 FLATPAK_EXTERN
-gboolean            flatpak_transaction_is_empty                  (FlatpakTransaction  *self);
+gboolean            flatpak_transaction_is_empty (FlatpakTransaction *self);
 
 #endif /* __FLATPAK_TRANSACTION_H__ */
diff --git a/common/flatpak-utils-private.h b/common/flatpak-utils-private.h
index 1829733a..c64b90e8 100644
--- a/common/flatpak-utils-private.h
+++ b/common/flatpak-utils-private.h
@@ -34,13 +34,13 @@
 #include <ostree.h>
 #include <json-glib/json-glib.h>
 
-#define AUTOFS_SUPER_MAGIC    0x0187
+#define AUTOFS_SUPER_MAGIC 0x0187
 
 typedef enum {
   FLATPAK_HOST_COMMAND_FLAGS_CLEAR_ENV = 1 << 0,
 } FlatpakHostCommandFlags;
 
-typedef void (*FlatpakLoadUriProgress) (guint64 downloaded_bytes,
+typedef void (*FlatpakLoadUriProgress) (guint64  downloaded_bytes,
                                         gpointer user_data);
 
 
@@ -50,12 +50,12 @@ typedef void (*FlatpakLoadUriProgress) (guint64 downloaded_bytes,
 #define FLATPAK_ANSI_COLOR_RESET "\x1b[0m"
 
 /* https://bugzilla.gnome.org/show_bug.cgi?id=766370 */
-#if !GLIB_CHECK_VERSION(2, 49, 3)
-#define FLATPAK_VARIANT_BUILDER_INITIALIZER {{0,}}
-#define FLATPAK_VARIANT_DICT_INITIALIZER {{0,}}
+#if !GLIB_CHECK_VERSION (2, 49, 3)
+#define FLATPAK_VARIANT_BUILDER_INITIALIZER {{0, }}
+#define FLATPAK_VARIANT_DICT_INITIALIZER {{0, }}
 #else
-#define FLATPAK_VARIANT_BUILDER_INITIALIZER {{{0,}}}
-#define FLATPAK_VARIANT_DICT_INITIALIZER {{{0,}}}
+#define FLATPAK_VARIANT_BUILDER_INITIALIZER {{{0, }}}
+#define FLATPAK_VARIANT_DICT_INITIALIZER {{{0, }}}
 #endif
 
 /* https://github.com/GNOME/libglnx/pull/38
@@ -64,7 +64,8 @@ typedef void (*FlatpakLoadUriProgress) (guint64 downloaded_bytes,
  */
 #define flatpak_fail glnx_throw
 
-void flatpak_debug2 (const char *format, ...) G_GNUC_PRINTF(1, 2);
+void flatpak_debug2 (const char *format,
+                     ...) G_GNUC_PRINTF (1, 2);
 
 gint flatpak_strcmp0_ptr (gconstpointer a,
                           gconstpointer b);
@@ -84,7 +85,7 @@ gboolean flatpak_is_linux32_arch (const char *arch);
 const char ** flatpak_get_gl_drivers (void);
 gboolean flatpak_extension_matches_reason (const char *extension_id,
                                            const char *reason,
-                                           gboolean default_value);
+                                           gboolean    default_value);
 
 const char * flatpak_get_bwrap (void);
 
@@ -96,26 +97,26 @@ char **flatpak_get_current_locale_langs (void);
 
 void flatpak_migrate_from_xdg_app (void);
 
-GFile *flatpak_file_new_tmp_in (GFile *dir,
+GFile *flatpak_file_new_tmp_in (GFile      *dir,
                                 const char *templatename,
-                                GError        **error);
+                                GError    **error);
 
-gboolean flatpak_write_update_checksum (GOutputStream  *out,
-                                        gconstpointer   data,
-                                        gsize           len,
-                                        gsize          *out_bytes_written,
-                                        GChecksum      *checksum,
-                                        GCancellable   *cancellable,
-                                        GError        **error);
+gboolean flatpak_write_update_checksum (GOutputStream *out,
+                                        gconstpointer  data,
+                                        gsize          len,
+                                        gsize         *out_bytes_written,
+                                        GChecksum     *checksum,
+                                        GCancellable  *cancellable,
+                                        GError       **error);
 
 
-gboolean flatpak_splice_update_checksum (GOutputStream  *out,
-                                         GInputStream   *in,
-                                         GChecksum      *checksum,
+gboolean flatpak_splice_update_checksum (GOutputStream         *out,
+                                         GInputStream          *in,
+                                         GChecksum             *checksum,
                                          FlatpakLoadUriProgress progress,
-                                         gpointer        progress_data,
-                                         GCancellable   *cancellable,
-                                         GError        **error);
+                                         gpointer               progress_data,
+                                         GCancellable          *cancellable,
+                                         GError               **error);
 
 GBytes * flatpak_read_stream (GInputStream *in,
                               gboolean      null_terminate,
@@ -133,31 +134,31 @@ gboolean flatpak_variant_bsearch_str (GVariant   *array,
                                       const char *str,
                                       int        *out_pos);
 GVariant *flatpak_repo_load_summary (OstreeRepo *repo,
-                                     GError **error);
+                                     GError    **error);
 char **  flatpak_summary_match_subrefs (GVariant   *summary,
                                         const char *collection_id,
                                         const char *ref);
-gboolean flatpak_summary_lookup_ref (GVariant    *summary,
-                                     const char  *collection_id,
-                                     const char  *ref,
-                                     char       **out_checksum,
-                                     GVariant   **out_variant);
+gboolean flatpak_summary_lookup_ref (GVariant   *summary,
+                                     const char *collection_id,
+                                     const char *ref,
+                                     char      **out_checksum,
+                                     GVariant  **out_variant);
 
 gboolean flatpak_name_matches_one_wildcard_prefix (const char         *string,
                                                    const char * const *maybe_wildcard_prefixes,
-                                                   gboolean require_exact_match);
+                                                   gboolean            require_exact_match);
 
-gboolean flatpak_get_allowed_exports (const char *source_path,
-                                      const char *app_id,
+gboolean flatpak_get_allowed_exports (const char     *source_path,
+                                      const char     *app_id,
                                       FlatpakContext *context,
-                                      char ***allowed_extensions_out,
-                                      char ***allowed_prefixes_out,
-                                      gboolean *require_exact_match_out);
+                                      char         ***allowed_extensions_out,
+                                      char         ***allowed_prefixes_out,
+                                      gboolean       *require_exact_match_out);
 
 gboolean flatpak_is_valid_name (const char *string,
-                                GError **error);
+                                GError    **error);
 gboolean flatpak_is_valid_branch (const char *string,
-                                  GError **error);
+                                  GError    **error);
 
 char * flatpak_make_valid_id_prefix (const char *orig_id);
 gboolean flatpak_id_has_subref_suffix (const char *id);
@@ -165,7 +166,8 @@ gboolean flatpak_id_has_subref_suffix (const char *id);
 char **flatpak_decompose_ref (const char *ref,
                               GError    **error);
 
-FlatpakKinds flatpak_kinds_from_bools (gboolean app, gboolean runtime);
+FlatpakKinds flatpak_kinds_from_bools (gboolean app,
+                                       gboolean runtime);
 
 gboolean flatpak_split_partial_ref_arg (const char   *partial_ref,
                                         FlatpakKinds  default_kinds,
@@ -200,11 +202,11 @@ char * flatpak_build_runtime_ref (const char *runtime,
 char * flatpak_build_app_ref (const char *app,
                               const char *branch,
                               const char *arch);
-char * flatpak_find_current_ref (const char *app_id,
+char * flatpak_find_current_ref (const char   *app_id,
                                  GCancellable *cancellable,
                                  GError      **error);
 GFile *flatpak_find_deploy_dir_for_ref (const char   *ref,
-                                        FlatpakDir **dir_out,
+                                        FlatpakDir  **dir_out,
                                         GCancellable *cancellable,
                                         GError      **error);
 GFile * flatpak_find_files_dir_for_ref (const char   *ref,
@@ -254,10 +256,10 @@ g_key_file_save_to_file (GKeyFile    *key_file,
 
 #if !GLIB_CHECK_VERSION (2, 50, 0)
 static inline gboolean
-g_key_file_load_from_bytes (GKeyFile             *key_file,
-                            GBytes               *bytes,
-                            GKeyFileFlags         flags,
-                            GError              **error)
+g_key_file_load_from_bytes (GKeyFile     *key_file,
+                            GBytes       *bytes,
+                            GKeyFileFlags flags,
+                            GError      **error)
 {
   const guchar *data;
   gsize size;
@@ -267,7 +269,8 @@ g_key_file_load_from_bytes (GKeyFile             *key_file,
 }
 #endif
 
-gboolean flatpak_g_ptr_array_contains_string (GPtrArray *array, const char *str);
+gboolean flatpak_g_ptr_array_contains_string (GPtrArray  *array,
+                                              const char *str);
 
 /* Returns the first string in subset that is not in strv */
 static inline const gchar *
@@ -303,10 +306,9 @@ flatpak_auto_lock_helper (GMutex *mutex)
   return mutex;
 }
 
-gboolean
-flatpak_switch_symlink_and_remove (const char *symlink_path,
-                                   const char *target,
-                                   GError **error);
+gboolean flatpak_switch_symlink_and_remove (const char *symlink_path,
+                                            const char *target,
+                                            GError    **error);
 gint flatpak_mkstempat (int    dir_fd,
                         gchar *tmpl,
                         int    flags,
@@ -321,14 +323,14 @@ gboolean flatpak_repo_set_redirect_url (OstreeRepo *repo,
 gboolean flatpak_repo_set_default_branch (OstreeRepo *repo,
                                           const char *branch,
                                           GError    **error);
-gboolean flatpak_repo_set_collection_id (OstreeRepo  *repo,
-                                         const char  *collection_id,
-                                         GError     **error);
-gboolean flatpak_repo_set_deploy_collection_id (OstreeRepo  *repo,
-                                                gboolean     deploy_collection_id,
-                                                GError     **error);
+gboolean flatpak_repo_set_collection_id (OstreeRepo *repo,
+                                         const char *collection_id,
+                                         GError    **error);
+gboolean flatpak_repo_set_deploy_collection_id (OstreeRepo *repo,
+                                                gboolean    deploy_collection_id,
+                                                GError    **error);
 gboolean flatpak_repo_set_gpg_keys (OstreeRepo *repo,
-                                    GBytes *bytes,
+                                    GBytes     *bytes,
                                     GError    **error);
 gboolean flatpak_repo_update (OstreeRepo   *repo,
                               const char  **gpg_key_ids,
@@ -347,13 +349,13 @@ GVariant *flatpak_repo_get_extra_data_sources (OstreeRepo   *repo,
                                                const char   *rev,
                                                GCancellable *cancellable,
                                                GError      **error);
-void flatpak_repo_parse_extra_data_sources (GVariant *extra_data_sources,
-                                            int index,
-                                            const char **name,
-                                            guint64 *download_size,
-                                            guint64 *installed_size,
+void flatpak_repo_parse_extra_data_sources (GVariant      *extra_data_sources,
+                                            int            index,
+                                            const char   **name,
+                                            guint64       *download_size,
+                                            guint64       *installed_size,
                                             const guchar **sha256,
-                                            const char **uri);
+                                            const char   **uri);
 gboolean flatpak_mtree_create_root (OstreeRepo        *repo,
                                     OstreeMutableTree *mtree,
                                     GCancellable      *cancellable,
@@ -378,78 +380,82 @@ gboolean flatpak_pull_from_bundle (OstreeRepo   *repo,
                                    GCancellable *cancellable,
                                    GError      **error);
 
-typedef void (*FlatpakOciPullProgress) (guint64 total_size, guint64 pulled_size,
-                                        guint32 n_layers, guint32 pulled_layers,
+typedef void (*FlatpakOciPullProgress) (guint64  total_size,
+                                        guint64  pulled_size,
+                                        guint32  n_layers,
+                                        guint32  pulled_layers,
                                         gpointer data);
 
-char * flatpak_pull_from_oci (OstreeRepo   *repo,
-                              FlatpakOciRegistry *registry,
-			      const char *oci_repository,
-                              const char *digest,
-                              FlatpakOciManifest *manifest,
-                              const char *remote,
-                              const char *ref,
+char * flatpak_pull_from_oci (OstreeRepo            *repo,
+                              FlatpakOciRegistry    *registry,
+                              const char            *oci_repository,
+                              const char            *digest,
+                              FlatpakOciManifest    *manifest,
+                              const char            *remote,
+                              const char            *ref,
                               FlatpakOciPullProgress progress_cb,
-                              gpointer progress_data,
-                              GCancellable *cancellable,
-                              GError      **error);
-
-gboolean flatpak_mirror_image_from_oci (FlatpakOciRegistry *dst_registry,
-                                        FlatpakOciRegistry *registry,
-                                        const char *oci_repository,
-                                        const char *digest,
+                              gpointer               progress_data,
+                              GCancellable          *cancellable,
+                              GError               **error);
+
+gboolean flatpak_mirror_image_from_oci (FlatpakOciRegistry    *dst_registry,
+                                        FlatpakOciRegistry    *registry,
+                                        const char            *oci_repository,
+                                        const char            *digest,
                                         FlatpakOciPullProgress progress_cb,
-                                        gpointer progress_data,
-                                        GCancellable *cancellable,
-                                        GError      **error);
+                                        gpointer               progress_data,
+                                        GCancellable          *cancellable,
+                                        GError               **error);
 
 typedef struct
 {
-  char *id;
-  char *installed_id;
-  char *commit;
-  char *ref;
-  char *directory;
-  char *files_path;
-  char *subdir_suffix;
-  char *add_ld_path;
-  char **merge_dirs;
-  int priority;
+  char    *id;
+  char    *installed_id;
+  char    *commit;
+  char    *ref;
+  char    *directory;
+  char    *files_path;
+  char    *subdir_suffix;
+  char    *add_ld_path;
+  char   **merge_dirs;
+  int      priority;
   gboolean needs_tmpfs;
   gboolean is_unmaintained;
 } FlatpakExtension;
 
 void flatpak_extension_free (FlatpakExtension *extension);
 
-void flatpak_parse_extension_with_tag (const char  *extension,
-                                       char       **name,
-                                       char       **tag);
+void flatpak_parse_extension_with_tag (const char *extension,
+                                       char      **name,
+                                       char      **tag);
 
 GList *flatpak_list_extensions (GKeyFile   *metakey,
                                 const char *arch,
                                 const char *branch);
 
 char * flatpak_quote_argv (const char *argv[],
-                           gssize len);
-gboolean flatpak_file_arg_has_suffix (const char *arg, const char *suffix);
+                           gssize      len);
+gboolean flatpak_file_arg_has_suffix (const char *arg,
+                                      const char *suffix);
 
 const char *flatpak_file_get_path_cached (GFile *file);
 
-GFile *flatpak_build_file_va (GFile *base,
+GFile *flatpak_build_file_va (GFile  *base,
                               va_list args);
-GFile *flatpak_build_file (GFile *base, ...) G_GNUC_NULL_TERMINATED;
+GFile *flatpak_build_file (GFile *base,
+                           ...) G_GNUC_NULL_TERMINATED;
 
-gboolean flatpak_openat_noatime (int            dfd,
-                                 const char    *name,
-                                 int           *ret_fd,
-                                 GCancellable  *cancellable,
-                                 GError       **error);
+gboolean flatpak_openat_noatime (int           dfd,
+                                 const char   *name,
+                                 int          *ret_fd,
+                                 GCancellable *cancellable,
+                                 GError      **error);
 
 typedef enum {
   FLATPAK_CP_FLAGS_NONE = 0,
-  FLATPAK_CP_FLAGS_MERGE = 1<<0,
-  FLATPAK_CP_FLAGS_NO_CHOWN = 1<<1,
-  FLATPAK_CP_FLAGS_MOVE = 1<<2,
+  FLATPAK_CP_FLAGS_MERGE = 1 << 0,
+  FLATPAK_CP_FLAGS_NO_CHOWN = 1 << 1,
+  FLATPAK_CP_FLAGS_MOVE = 1 << 2,
 } FlatpakCpFlags;
 
 gboolean   flatpak_cp_a (GFile         *src,
@@ -458,43 +464,42 @@ gboolean   flatpak_cp_a (GFile         *src,
                          GCancellable  *cancellable,
                          GError       **error);
 
-gboolean flatpak_zero_mtime (int parent_dfd,
-                             const char *rel_path,
-                             GCancellable  *cancellable,
-                             GError       **error);
+gboolean flatpak_zero_mtime (int           parent_dfd,
+                             const char   *rel_path,
+                             GCancellable *cancellable,
+                             GError      **error);
 
-gboolean flatpak_mkdir_p (GFile         *dir,
-                          GCancellable  *cancellable,
-                          GError       **error);
+gboolean flatpak_mkdir_p (GFile        *dir,
+                          GCancellable *cancellable,
+                          GError      **error);
 
-gboolean flatpak_rm_rf (GFile         *dir,
-                        GCancellable  *cancellable,
-                        GError       **error);
+gboolean flatpak_rm_rf (GFile        *dir,
+                        GCancellable *cancellable,
+                        GError      **error);
 
 char * flatpak_readlink (const char *path,
-                         GError       **error);
+                         GError    **error);
 char * flatpak_resolve_link (const char *path,
-                             GError **error);
+                             GError    **error);
 char * flatpak_canonicalize_filename (const char *path);
 
-gboolean flatpak_file_rename (GFile *from,
-                              GFile *to,
-                              GCancellable  *cancellable,
-                              GError       **error);
+gboolean flatpak_file_rename (GFile        *from,
+                              GFile        *to,
+                              GCancellable *cancellable,
+                              GError      **error);
 
-gboolean flatpak_open_in_tmpdir_at (int                tmpdir_fd,
-                                    int                mode,
-                                    char              *tmpl,
-                                    GOutputStream    **out_stream,
-                                    GCancellable      *cancellable,
-                                    GError           **error);
+gboolean flatpak_open_in_tmpdir_at (int             tmpdir_fd,
+                                    int             mode,
+                                    char           *tmpl,
+                                    GOutputStream **out_stream,
+                                    GCancellable   *cancellable,
+                                    GError        **error);
 
-gboolean
-flatpak_buffer_to_sealed_memfd_or_tmpfile (GLnxTmpfile *tmpf,
-                                           const char  *name,
-                                           const char  *str,
-                                           size_t       len,
-                                           GError     **error);
+gboolean flatpak_buffer_to_sealed_memfd_or_tmpfile (GLnxTmpfile *tmpf,
+                                                    const char  *name,
+                                                    const char  *str,
+                                                    size_t       len,
+                                                    GError     **error);
 
 static inline void
 flatpak_temp_dir_destroy (void *p)
@@ -525,6 +530,7 @@ static inline GMainContextPopDefault *
 flatpak_main_context_new_default (void)
 {
   GMainContext *main_context = g_main_context_new ();
+
   g_main_context_push_thread_default (main_context);
   return main_context;
 }
@@ -547,13 +553,13 @@ flatpak_repo_transaction_cleanup (void *p)
 }
 
 static inline FlatpakRepoTransaction *
-flatpak_repo_transaction_start (OstreeRepo     *repo,
-                                GCancellable   *cancellable,
-                                GError        **error)
+flatpak_repo_transaction_start (OstreeRepo   *repo,
+                                GCancellable *cancellable,
+                                GError      **error)
 {
   if (!ostree_repo_prepare_transaction (repo, NULL, cancellable, error))
     return NULL;
-  return (FlatpakRepoTransaction *)repo;
+  return (FlatpakRepoTransaction *) repo;
 }
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakRepoTransaction, flatpak_repo_transaction_cleanup)
 
@@ -567,7 +573,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakRepoTransaction, flatpak_repo_transaction_
    We actually check against 2017.3 so that we work on the git releases *after* 2017.3
    which is safe, because the real OSTREE_CHECK_VERSION macro was added after 2017.3
    too. */
-#if !OSTREE_CHECK_VERSION(2017, 3)
+#if !OSTREE_CHECK_VERSION (2017, 3)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeRepo, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeMutableTree, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeAsyncProgress, g_object_unref)
@@ -584,7 +590,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (SoupRequestHTTP, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (SoupURI, soup_uri_free)
 #endif
 
-#if !JSON_CHECK_VERSION(1,1,2)
+#if !JSON_CHECK_VERSION (1, 1, 2)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonArray, json_array_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonBuilder, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonGenerator, g_object_unref)
@@ -595,8 +601,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonPath, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (JsonReader, g_object_unref)
 #endif
 
-#if !GLIB_CHECK_VERSION(2, 43, 4)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUnixFDList, g_object_unref)
+#if !GLIB_CHECK_VERSION (2, 43, 4)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (GUnixFDList, g_object_unref)
 #endif
 
 /* This uses a weird Auto prefix to avoid conflicts with later added autogenerated autoptr support, per:
@@ -647,8 +653,8 @@ gboolean   flatpak_appstream_xml_migrate (FlatpakXml *source,
                                           const char *id,
                                           GKeyFile   *metadata);
 gboolean flatpak_appstream_xml_root_to_data (FlatpakXml *appstream_root,
-                                             GBytes **uncompressed,
-                                             GBytes **compressed,
+                                             GBytes    **uncompressed,
+                                             GBytes    **compressed,
                                              GError    **error);
 gboolean   flatpak_repo_generate_appstream (OstreeRepo   *repo,
                                             const char  **gpg_key_ids,
@@ -668,33 +674,37 @@ gboolean flatpak_allocate_tmpdir (int           tmpdir_dfd,
                                   GError      **error);
 
 
-gboolean flatpak_yes_no_prompt (const char *prompt, ...) G_GNUC_PRINTF(1, 2);
-long flatpak_number_prompt (int min, int max, const char *prompt, ...) G_GNUC_PRINTF(3, 4);
+gboolean flatpak_yes_no_prompt (const char *prompt,
+                                ...) G_GNUC_PRINTF (1, 2);
+long flatpak_number_prompt (int         min,
+                            int         max,
+                            const char *prompt,
+                            ...) G_GNUC_PRINTF (3, 4);
 
 SoupSession * flatpak_create_soup_session (const char *user_agent);
 
 typedef enum {
   FLATPAK_HTTP_FLAGS_NONE = 0,
-  FLATPAK_HTTP_FLAGS_ACCEPT_OCI = 1<<0,
+  FLATPAK_HTTP_FLAGS_ACCEPT_OCI = 1 << 0,
 } FlatpakHTTPFlags;
 
-GBytes * flatpak_load_http_uri (SoupSession *soup_session,
-                                const char   *uri,
-				FlatpakHTTPFlags flags,
-                                const char   *etag,
-                                char        **out_etag,
+GBytes * flatpak_load_http_uri (SoupSession           *soup_session,
+                                const char            *uri,
+                                FlatpakHTTPFlags       flags,
+                                const char            *etag,
+                                char                 **out_etag,
                                 FlatpakLoadUriProgress progress,
-                                gpointer      user_data,
-                                GCancellable *cancellable,
-                                GError      **error);
-gboolean flatpak_download_http_uri (SoupSession *soup_session,
-                                    const char   *uri,
-				    FlatpakHTTPFlags flags,
-                                    GOutputStream *out,
+                                gpointer               user_data,
+                                GCancellable          *cancellable,
+                                GError               **error);
+gboolean flatpak_download_http_uri (SoupSession           *soup_session,
+                                    const char            *uri,
+                                    FlatpakHTTPFlags       flags,
+                                    GOutputStream         *out,
                                     FlatpakLoadUriProgress progress,
-                                    gpointer      user_data,
-                                    GCancellable *cancellable,
-                                    GError      **error);
+                                    gpointer               user_data,
+                                    GCancellable          *cancellable,
+                                    GError               **error);
 
 typedef void (*FlatpakProgressCallback)(const char *status,
                                         guint       progress,
@@ -707,7 +717,7 @@ OstreeAsyncProgress *flatpak_progress_new (FlatpakProgressCallback progress,
 void flatpak_log_dir_access (FlatpakDir *dir);
 
 gboolean flatpak_check_required_version (const char *ref,
-                                         GKeyFile *metakey,
-                                         GError **error);
+                                         GKeyFile   *metakey,
+                                         GError    **error);
 
 #endif /* __FLATPAK_UTILS_H__ */
diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c
index eba6c300..2deaf3cb 100644
--- a/common/flatpak-utils.c
+++ b/common/flatpak-utils.c
@@ -56,10 +56,10 @@ static const GDBusErrorEntry flatpak_error_entries[] = {
 };
 
 typedef struct archive FlatpakAutoArchiveRead;
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(FlatpakAutoArchiveRead, archive_read_free)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakAutoArchiveRead, archive_read_free)
 
 static void
-propagate_libarchive_error (GError      **error,
+propagate_libarchive_error (GError        **error,
                             struct archive *a)
 {
   g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
@@ -86,7 +86,7 @@ flatpak_debug2 (const char *format, ...)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
   va_start (var_args, format);
-  g_logv (G_LOG_DOMAIN"2",
+  g_logv (G_LOG_DOMAIN "2",
           G_LOG_LEVEL_DEBUG,
           format, var_args);
   va_end (var_args);
@@ -95,9 +95,9 @@ flatpak_debug2 (const char *format, ...)
 }
 
 GFile *
-flatpak_file_new_tmp_in (GFile *dir,
+flatpak_file_new_tmp_in (GFile      *dir,
                          const char *template,
-                         GError        **error)
+                         GError    **error)
 {
   glnx_autofd int tmp_fd = -1;
   g_autofree char *tmpl = g_build_filename (flatpak_file_get_path_cached (dir), template, NULL);
@@ -113,13 +113,13 @@ flatpak_file_new_tmp_in (GFile *dir,
 }
 
 gboolean
-flatpak_write_update_checksum (GOutputStream  *out,
-                               gconstpointer   data,
-                               gsize           len,
-                               gsize          *out_bytes_written,
-                               GChecksum      *checksum,
-                               GCancellable   *cancellable,
-                               GError        **error)
+flatpak_write_update_checksum (GOutputStream *out,
+                               gconstpointer  data,
+                               gsize          len,
+                               gsize         *out_bytes_written,
+                               GChecksum     *checksum,
+                               GCancellable  *cancellable,
+                               GError       **error)
 {
   if (out)
     {
@@ -139,16 +139,16 @@ flatpak_write_update_checksum (GOutputStream  *out,
 }
 
 gboolean
-flatpak_splice_update_checksum (GOutputStream  *out,
-                                GInputStream   *in,
-                                GChecksum      *checksum,
+flatpak_splice_update_checksum (GOutputStream         *out,
+                                GInputStream          *in,
+                                GChecksum             *checksum,
                                 FlatpakLoadUriProgress progress,
-                                gpointer        progress_data,
-                                GCancellable   *cancellable,
-                                GError        **error)
+                                gpointer               progress_data,
+                                GCancellable          *cancellable,
+                                GError               **error)
 {
   gsize bytes_read, bytes_written;
-  char buf[32*1024];
+  char buf[32 * 1024];
   guint64 downloaded_bytes = 0;
   gint64 progress_start;
 
@@ -420,7 +420,8 @@ flatpak_is_linux32_arch (const char *arch)
   return FALSE;
 }
 
-static struct {
+static struct
+{
   const char *kernel_arch;
   const char *compat_arch;
 } compat_arches[] = {
@@ -434,7 +435,7 @@ flatpak_get_compat_arch (const char *kernel_arch)
   int i;
 
   /* Also add all other arches that are compatible with the kernel arch */
-  for (i = 0; i < G_N_ELEMENTS(compat_arches); i++)
+  for (i = 0; i < G_N_ELEMENTS (compat_arches); i++)
     {
       if (strcmp (compat_arches[i].kernel_arch, kernel_arch) == 0)
         return compat_arches[i].compat_arch;
@@ -449,7 +450,7 @@ flatpak_get_compat_arch_reverse (const char *compat_arch)
   int i;
 
   /* Also add all other arches that are compatible with the kernel arch */
-  for (i = 0; i < G_N_ELEMENTS(compat_arches); i++)
+  for (i = 0; i < G_N_ELEMENTS (compat_arches); i++)
     {
       if (strcmp (compat_arches[i].compat_arch, compat_arch) == 0)
         return compat_arches[i].kernel_arch;
@@ -474,25 +475,26 @@ flatpak_get_arches (void)
 
       /* This is the userspace arch, i.e. the one flatpak itself was
          build for. It's always first. */
-      g_ptr_array_add (array, (char *)main_arch);
+      g_ptr_array_add (array, (char *) main_arch);
 
       compat_arch = flatpak_get_compat_arch (kernel_arch);
       if (g_strcmp0 (compat_arch, main_arch) != 0)
-        g_ptr_array_add (array, (char *)compat_arch);
+        g_ptr_array_add (array, (char *) compat_arch);
 
       g_ptr_array_add (array, NULL);
-      new_arches = (gsize)g_ptr_array_free (array, FALSE);
+      new_arches = (gsize) g_ptr_array_free (array, FALSE);
 
       g_once_init_leave (&arches, new_arches);
- }
+    }
 
-  return (const char **)arches;
+  return (const char **) arches;
 }
 
 const char **
 flatpak_get_gl_drivers (void)
 {
   static gsize drivers = 0;
+
   if (g_once_init_enter (&drivers))
     {
       gsize new_drivers;
@@ -516,18 +518,18 @@ flatpak_get_gl_drivers (void)
               g_ptr_array_add (array, g_strconcat ("nvidia-", nvidia_version, NULL));
             }
 
-          g_ptr_array_add (array, (char *)"default");
-          g_ptr_array_add (array, (char *)"host");
+          g_ptr_array_add (array, (char *) "default");
+          g_ptr_array_add (array, (char *) "host");
 
           g_ptr_array_add (array, NULL);
-          new_drivers_c = (char **)g_ptr_array_free (array, FALSE);
+          new_drivers_c = (char **) g_ptr_array_free (array, FALSE);
         }
 
-      new_drivers = (gsize)new_drivers_c;
+      new_drivers = (gsize) new_drivers_c;
       g_once_init_leave (&drivers, new_drivers);
     }
 
-  return (const char **)drivers;
+  return (const char **) drivers;
 }
 
 static gboolean
@@ -553,7 +555,7 @@ flatpak_get_gtk_theme (void)
       g_autoptr(GSettingsSchema) schema = NULL;
 
       if (source == NULL)
-          g_once_init_leave (&gtk_theme, g_strdup (""));
+        g_once_init_leave (&gtk_theme, g_strdup (""));
       else
         {
           schema = g_settings_schema_source_lookup (source,
@@ -573,13 +575,13 @@ flatpak_get_gtk_theme (void)
         }
     }
 
-  return (const char*)gtk_theme;
+  return (const char *) gtk_theme;
 }
 
 gboolean
 flatpak_fancy_output (void)
 {
-        return isatty (STDOUT_FILENO);
+  return isatty (STDOUT_FILENO);
 }
 
 const char *
@@ -661,7 +663,7 @@ is_valid_name_character (gint c, gboolean allow_dash)
  */
 gboolean
 flatpak_is_valid_name (const char *string,
-                       GError **error)
+                       GError    **error)
 {
   guint len;
   gboolean ret;
@@ -765,7 +767,7 @@ out:
 gboolean
 flatpak_name_matches_one_wildcard_prefix (const char         *name,
                                           const char * const *wildcarded_prefixes,
-                                          gboolean require_exact_match)
+                                          gboolean            require_exact_match)
 {
   const char * const *iter = wildcarded_prefixes;
   const char *remainder;
@@ -827,12 +829,12 @@ flatpak_name_matches_one_wildcard_prefix (const char         *name,
 }
 
 gboolean
-flatpak_get_allowed_exports (const char *source_path,
-                             const char *app_id,
+flatpak_get_allowed_exports (const char     *source_path,
+                             const char     *app_id,
                              FlatpakContext *context,
-                             char ***allowed_extensions_out,
-                             char ***allowed_prefixes_out,
-                             gboolean *require_exact_match_out)
+                             char         ***allowed_extensions_out,
+                             char         ***allowed_prefixes_out,
+                             gboolean       *require_exact_match_out)
 {
   g_autoptr(GPtrArray) allowed_extensions = g_ptr_array_new_with_free_func (g_free);
   g_autoptr(GPtrArray) allowed_prefixes = g_ptr_array_new_with_free_func (g_free);
@@ -879,10 +881,10 @@ flatpak_get_allowed_exports (const char *source_path,
   g_ptr_array_add (allowed_prefixes, NULL);
 
   if (allowed_extensions_out)
-    *allowed_extensions_out = (char **)g_ptr_array_free (g_steal_pointer (&allowed_extensions), FALSE);
+    *allowed_extensions_out = (char **) g_ptr_array_free (g_steal_pointer (&allowed_extensions), FALSE);
 
   if (allowed_prefixes_out)
-    *allowed_prefixes_out = (char **)g_ptr_array_free (g_steal_pointer (&allowed_prefixes), FALSE);
+    *allowed_prefixes_out = (char **) g_ptr_array_free (g_steal_pointer (&allowed_prefixes), FALSE);
 
   if (require_exact_match_out)
     *require_exact_match_out = require_exact_match;
@@ -927,7 +929,7 @@ is_valid_branch_character (gint c)
  */
 gboolean
 flatpak_is_valid_branch (const char *string,
-                         GError **error)
+                         GError    **error)
 {
   guint len;
   gboolean ret;
@@ -1049,7 +1051,8 @@ next_element (const char **partial_ref)
 {
   const char *slash;
   const char *end;
-  slash = (const char *)strchr (*partial_ref, '/');
+
+  slash = (const char *) strchr (*partial_ref, '/');
   if (slash != NULL)
     {
       end = slash;
@@ -1102,6 +1105,7 @@ _flatpak_split_partial_ref_arg (const char   *partial_ref,
   const char *branch_start = NULL;
   const char *branch_end = NULL;
   g_autofree char *branch = NULL;
+
   g_autoptr(GError) local_error = NULL;
   FlatpakKinds kinds = 0;
 
@@ -1328,6 +1332,7 @@ flatpak_list_unmaintained_refs (const char   *name_prefix,
                                 GError      **error)
 {
   gchar **ret = NULL;
+
   g_autoptr(GPtrArray) names = NULL;
   g_autoptr(GHashTable) hash = NULL;
   g_autoptr(FlatpakDir) user_dir = NULL;
@@ -1375,7 +1380,7 @@ flatpak_list_unmaintained_refs (const char   *name_prefix,
 
 GFile *
 flatpak_find_deploy_dir_for_ref (const char   *ref,
-                                 FlatpakDir **dir_out,
+                                 FlatpakDir  **dir_out,
                                  GCancellable *cancellable,
                                  GError      **error)
 {
@@ -1465,15 +1470,16 @@ flatpak_find_unmaintained_extension_dir_if_exists (const char   *name,
   if (extension_dir == NULL)
     return NULL;
 
-  return g_steal_pointer(&extension_dir);
+  return g_steal_pointer (&extension_dir);
 }
 
 char *
-flatpak_find_current_ref (const char *app_id,
+flatpak_find_current_ref (const char   *app_id,
                           GCancellable *cancellable,
                           GError      **error)
 {
   g_autofree char *current_ref = NULL;
+
   g_autoptr(FlatpakDir) user_dir = flatpak_dir_get_user ();
   int i;
 
@@ -1550,6 +1556,7 @@ remove_dangling_symlinks (int           parent_fd,
 {
   gboolean ret = FALSE;
   struct dirent *dent;
+
   g_auto(GLnxDirFdIterator) iter = { 0 };
 
   if (!glnx_dirfd_iterator_init_at (parent_fd, name, FALSE, &iter, error))
@@ -1618,7 +1625,7 @@ out:
 gboolean
 flatpak_switch_symlink_and_remove (const char *symlink_path,
                                    const char *target,
-                                   GError **error)
+                                   GError    **error)
 {
   g_autofree char *symlink_dir = g_path_get_dirname (symlink_path);
   int try;
@@ -1757,13 +1764,13 @@ needs_quoting (const char *arg)
 
 char *
 flatpak_quote_argv (const char *argv[],
-                    gssize len)
+                    gssize      len)
 {
   GString *res = g_string_new ("");
   int i;
 
   if (len == -1)
-    len = g_strv_length ((char **)argv);
+    len = g_strv_length ((char **) argv);
 
   for (i = 0; i < len; i++)
     {
@@ -1793,7 +1800,7 @@ flatpak_file_arg_has_suffix (const char *arg, const char *suffix)
 }
 
 GFile *
-flatpak_build_file_va (GFile *base,
+flatpak_build_file_va (GFile  *base,
                        va_list args)
 {
   g_autoptr(GFile) res = g_object_ref (base);
@@ -1832,7 +1839,7 @@ flatpak_file_get_path_cached (GFile *file)
 
   do
     {
-      path = g_object_get_qdata ((GObject*)file, _file_path_quark);
+      path = g_object_get_qdata ((GObject *) file, _file_path_quark);
       if (path == NULL)
         {
           g_autofree char *new_path = NULL;
@@ -1840,7 +1847,7 @@ flatpak_file_get_path_cached (GFile *file)
           if (new_path == NULL)
             return NULL;
 
-          if (g_object_replace_qdata ((GObject*)file, _file_path_quark,
+          if (g_object_replace_qdata ((GObject *) file, _file_path_quark,
                                       NULL, new_path, g_free, NULL))
             path = g_steal_pointer (&new_path);
         }
@@ -1851,11 +1858,11 @@ flatpak_file_get_path_cached (GFile *file)
 }
 
 gboolean
-flatpak_openat_noatime (int            dfd,
-                        const char    *name,
-                        int           *ret_fd,
-                        GCancellable  *cancellable,
-                        GError       **error)
+flatpak_openat_noatime (int           dfd,
+                        const char   *name,
+                        int          *ret_fd,
+                        GCancellable *cancellable,
+                        GError      **error)
 {
   int fd;
   int flags = O_RDONLY | O_CLOEXEC;
@@ -1869,9 +1876,9 @@ flatpak_openat_noatime (int            dfd,
    */
   if (fd == -1 && (errno == EPERM || errno == EINVAL))
 #endif
-    do
-      fd = openat (dfd, name, flags, 0);
-    while (G_UNLIKELY (fd == -1 && errno == EINTR));
+  do
+    fd = openat (dfd, name, flags, 0);
+  while (G_UNLIKELY (fd == -1 && errno == EINTR));
 
   if (fd == -1)
     {
@@ -1900,6 +1907,7 @@ flatpak_cp_a (GFile         *src,
   gboolean merge = (flags & FLATPAK_CP_FLAGS_MERGE) != 0;
   gboolean no_chown = (flags & FLATPAK_CP_FLAGS_NO_CHOWN) != 0;
   gboolean move = (flags & FLATPAK_CP_FLAGS_MOVE) != 0;
+
   g_autoptr(GFileInfo) child_info = NULL;
   GError *temp_error = NULL;
   int r;
@@ -2014,10 +2022,10 @@ out:
 }
 
 gboolean
-flatpak_zero_mtime (int parent_dfd,
-                    const char *rel_path,
-                    GCancellable  *cancellable,
-                    GError       **error)
+flatpak_zero_mtime (int           parent_dfd,
+                    const char   *rel_path,
+                    GCancellable *cancellable,
+                    GError      **error)
 {
   struct stat stbuf;
 
@@ -2072,9 +2080,9 @@ flatpak_zero_mtime (int parent_dfd,
 /* Make a directory, and its parent. Don't error if it already exists.
  * If you want a failure mode with EEXIST, use g_file_make_directory_with_parents. */
 gboolean
-flatpak_mkdir_p (GFile         *dir,
-                 GCancellable  *cancellable,
-                 GError       **error)
+flatpak_mkdir_p (GFile        *dir,
+                 GCancellable *cancellable,
+                 GError      **error)
 {
   return glnx_shutil_mkdir_p_at (AT_FDCWD,
                                  flatpak_file_get_path_cached (dir),
@@ -2084,9 +2092,9 @@ flatpak_mkdir_p (GFile         *dir,
 }
 
 gboolean
-flatpak_rm_rf (GFile         *dir,
-               GCancellable  *cancellable,
-               GError       **error)
+flatpak_rm_rf (GFile        *dir,
+               GCancellable *cancellable,
+               GError      **error)
 {
   return glnx_shutil_rm_rf_at (AT_FDCWD,
                                flatpak_file_get_path_cached (dir),
@@ -2095,7 +2103,7 @@ flatpak_rm_rf (GFile         *dir,
 
 char *
 flatpak_readlink (const char *path,
-                  GError **error)
+                  GError    **error)
 {
   char buf[PATH_MAX + 1];
   ssize_t symlink_size;
@@ -2113,7 +2121,7 @@ flatpak_readlink (const char *path,
 
 char *
 flatpak_resolve_link (const char *path,
-                      GError **error)
+                      GError    **error)
 {
   g_autofree char *link = flatpak_readlink (path, error);
   g_autofree char *dirname = NULL;
@@ -2135,10 +2143,11 @@ flatpak_canonicalize_filename (const char *path)
   return g_file_get_path (file);
 }
 
-gboolean flatpak_file_rename (GFile *from,
-                              GFile *to,
-                              GCancellable  *cancellable,
-                              GError       **error)
+gboolean
+flatpak_file_rename (GFile        *from,
+                     GFile        *to,
+                     GCancellable *cancellable,
+                     GError      **error)
 {
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return FALSE;
@@ -2204,12 +2213,12 @@ flatpak_buffer_to_sealed_memfd_or_tmpfile (GLnxTmpfile *tmpf,
 }
 
 gboolean
-flatpak_open_in_tmpdir_at (int                tmpdir_fd,
-                           int                mode,
-                           char              *tmpl,
-                           GOutputStream    **out_stream,
-                           GCancellable      *cancellable,
-                           GError           **error)
+flatpak_open_in_tmpdir_at (int             tmpdir_fd,
+                           int             mode,
+                           char           *tmpl,
+                           GOutputStream **out_stream,
+                           GCancellable   *cancellable,
+                           GError        **error)
 {
   const int max_attempts = 128;
   int i;
@@ -2444,15 +2453,15 @@ flatpak_summary_match_subrefs (GVariant   *summary,
     }
 
   g_ptr_array_add (res, NULL);
-  return (char **)g_ptr_array_free (res, FALSE);
+  return (char **) g_ptr_array_free (res, FALSE);
 }
 
 gboolean
-flatpak_summary_lookup_ref (GVariant    *summary,
-                            const char  *collection_id,
-                            const char  *ref,
-                            char       **out_checksum,
-                            GVariant   **out_variant)
+flatpak_summary_lookup_ref (GVariant   *summary,
+                            const char *collection_id,
+                            const char *ref,
+                            char      **out_checksum,
+                            GVariant  **out_variant)
 {
   g_autoptr(GVariant) refs = NULL;
   int pos;
@@ -2525,9 +2534,9 @@ flatpak_repo_set_redirect_url (OstreeRepo *repo,
 }
 
 gboolean
-flatpak_repo_set_deploy_collection_id (OstreeRepo  *repo,
-                                       gboolean     deploy_collection_id,
-                                       GError     **error)
+flatpak_repo_set_deploy_collection_id (OstreeRepo *repo,
+                                       gboolean    deploy_collection_id,
+                                       GError    **error)
 {
   g_autoptr(GKeyFile) config = NULL;
 
@@ -2538,7 +2547,7 @@ flatpak_repo_set_deploy_collection_id (OstreeRepo  *repo,
 
 gboolean
 flatpak_repo_set_gpg_keys (OstreeRepo *repo,
-                           GBytes *bytes,
+                           GBytes     *bytes,
                            GError    **error)
 {
   g_autoptr(GKeyFile) config = NULL;
@@ -2577,9 +2586,9 @@ flatpak_repo_set_default_branch (OstreeRepo *repo,
 }
 
 gboolean
-flatpak_repo_set_collection_id (OstreeRepo  *repo,
-                                const char  *collection_id,
-                                GError     **error)
+flatpak_repo_set_collection_id (OstreeRepo *repo,
+                                const char *collection_id,
+                                GError    **error)
 {
   g_autoptr(GKeyFile) config = NULL;
 
@@ -2595,7 +2604,7 @@ flatpak_repo_set_collection_id (OstreeRepo  *repo,
 
 GVariant *
 flatpak_commit_get_extra_data_sources (GVariant *commitv,
-                                       GError      **error)
+                                       GError  **error)
 {
   g_autoptr(GVariant) commit_metadata = NULL;
   g_autoptr(GVariant) extra_data_sources = NULL;
@@ -2633,13 +2642,13 @@ flatpak_repo_get_extra_data_sources (OstreeRepo   *repo,
 }
 
 void
-flatpak_repo_parse_extra_data_sources (GVariant *extra_data_sources,
-                                       int index,
-                                       const char **name,
-                                       guint64 *download_size,
-                                       guint64 *installed_size,
+flatpak_repo_parse_extra_data_sources (GVariant      *extra_data_sources,
+                                       int            index,
+                                       const char   **name,
+                                       guint64       *download_size,
+                                       guint64       *installed_size,
                                        const guchar **sha256,
-                                       const char **uri)
+                                       const char   **uri)
 {
   g_autoptr(GVariant) sha256_v = NULL;
   g_variant_get_child (extra_data_sources, index, "(^aytt@ay&s)",
@@ -2762,10 +2771,10 @@ flatpak_repo_collect_sizes (OstreeRepo   *repo,
 
 
 static void
-flatpak_repo_collect_extra_data_sizes (OstreeRepo   *repo,
-                                       const char   *rev,
-                                       guint64      *installed_size,
-                                       guint64      *download_size)
+flatpak_repo_collect_extra_data_sizes (OstreeRepo *repo,
+                                       const char *rev,
+                                       guint64    *installed_size,
+                                       guint64    *download_size)
 {
   g_autoptr(GVariant) extra_data_sources = NULL;
   gsize n_extra_data;
@@ -2799,9 +2808,10 @@ flatpak_repo_collect_extra_data_sizes (OstreeRepo   *repo,
 /* Loads a summary file from a local repo */
 GVariant *
 flatpak_repo_load_summary (OstreeRepo *repo,
-                           GError **error)
+                           GError    **error)
 {
   glnx_autofd int fd = -1;
+
   g_autoptr(GMappedFile) mfile = NULL;
   g_autoptr(GBytes) bytes = NULL;
 
@@ -2821,10 +2831,11 @@ flatpak_repo_load_summary (OstreeRepo *repo,
   return g_variant_ref_sink (g_variant_new_from_bytes (OSTREE_SUMMARY_GVARIANT_FORMAT, bytes, TRUE));
 }
 
-typedef struct {
-  guint64 installed_size;
-  guint64 download_size;
-  char *metadata_contents;
+typedef struct
+{
+  guint64   installed_size;
+  guint64   download_size;
+  char     *metadata_contents;
   GVariant *sparse_data;
 } CommitData;
 
@@ -2832,6 +2843,7 @@ static void
 commit_data_free (gpointer data)
 {
   CommitData *rev_data = data;
+
   g_free (rev_data->metadata_contents);
   if (rev_data->sparse_data)
     g_variant_unref (rev_data->sparse_data);
@@ -2843,7 +2855,7 @@ commit_data_free (gpointer data)
 static void
 populate_commit_data_cache (GVariant   *metadata,
                             GVariant   *summary,
-                            GHashTable *commit_data_cache  /* (element-type utf8 CommitData) */)
+                            GHashTable *commit_data_cache /* (element-type utf8 CommitData) */)
 {
   g_autoptr(GVariant) cache_v = NULL;
   g_autoptr(GVariant) cache = NULL;
@@ -2928,6 +2940,7 @@ flatpak_repo_update (OstreeRepo   *repo,
   g_autofree char *redirect_url = NULL;
   g_autofree char *default_branch = NULL;
   g_autofree char *gpg_keys = NULL;
+
   g_autoptr(GVariant) old_summary = NULL;
   g_autoptr(GVariant) new_summary = NULL;
   g_autoptr(GHashTable) refs = NULL;
@@ -2984,7 +2997,7 @@ flatpak_repo_update (OstreeRepo   *repo,
 
       g_variant_builder_add (&builder, "{sv}", "xa.gpg-keys",
                              g_variant_new_from_data (G_VARIANT_TYPE ("ay"), decoded, decoded_len,
-                                                      TRUE, (GDestroyNotify)g_free, decoded));
+                                                      TRUE, (GDestroyNotify) g_free, decoded));
     }
 
   g_variant_builder_init (&ref_data_builder, G_VARIANT_TYPE ("a{s(tts)}"));
@@ -3104,7 +3117,7 @@ flatpak_repo_update (OstreeRepo   *repo,
             g_variant_builder_add (&sparse_builder, "{sv}", "eolr", g_variant_new_string (eol_rebase));
 
           rev_data->sparse_data = g_variant_ref_sink (g_variant_builder_end (&sparse_builder));
-       }
+        }
 
       g_hash_table_insert (commit_data_cache, g_strdup (rev), rev_data);
     }
@@ -3124,7 +3137,7 @@ flatpak_repo_update (OstreeRepo   *repo,
       if (rev_data->sparse_data)
         g_variant_builder_add (&ref_sparse_data_builder, "{s@a{sv}}",
                                ref, rev_data->sparse_data);
-   }
+    }
 
   /* Note: xa.cache doesn’t need to support collection IDs for the refs listed
    * in it, because the xa.cache metadata is stored on the ostree-metadata ref,
@@ -3169,7 +3182,7 @@ flatpak_repo_update (OstreeRepo   *repo,
         goto out;
 
       if (!ostree_repo_write_commit (repo, old_ostree_metadata_checksum,
-                                     NULL  /* subject */, NULL  /* body */,
+                                     NULL /* subject */, NULL /* body */,
                                      new_summary_commit, repo_file, &new_ostree_metadata_checksum,
                                      NULL, error))
         goto out;
@@ -3300,7 +3313,7 @@ validate_component (FlatpakXml *component,
   /* Drop .desktop file suffix (unless the actual app id ends with .desktop) */
   if (g_str_has_suffix (id_text, ".desktop") &&
       !g_str_has_suffix (id, ".desktop"))
-    id_text[strlen(id_text)-strlen(".desktop")] = 0;
+    id_text[strlen (id_text) - strlen (".desktop")] = 0;
 
   if (!g_str_has_prefix (id_text, id))
     {
@@ -3616,8 +3629,8 @@ flatpak_appstream_xml_new (void)
 
 gboolean
 flatpak_appstream_xml_root_to_data (FlatpakXml *appstream_root,
-                                    GBytes **uncompressed,
-                                    GBytes **compressed,
+                                    GBytes    **uncompressed,
+                                    GBytes    **compressed,
                                     GError    **error)
 {
   g_autoptr(GString) xml = NULL;
@@ -3677,7 +3690,7 @@ flatpak_repo_generate_appstream (OstreeRepo   *repo,
                               error))
     return FALSE;
 
-  all_refs_keys = (const char **)g_hash_table_get_keys_as_array (all_refs, &n_keys);
+  all_refs_keys = (const char **) g_hash_table_get_keys_as_array (all_refs, &n_keys);
 
   /* Sort refs so that appdata order is stable for e.g. deltas */
   g_qsort_with_data (all_refs_keys, n_keys, sizeof (char *), (GCompareDataFunc) flatpak_strcmp0_ptr, NULL);
@@ -3706,226 +3719,228 @@ flatpak_repo_generate_appstream (OstreeRepo   *repo,
     }
 
   GLNX_HASH_TABLE_FOREACH (arches, const char *, arch)
-    {
-      g_autofree char *tmpdir = g_strdup ("/tmp/flatpak-appstream-XXXXXX");
-      g_autoptr(FlatpakTempDir) tmpdir_file = NULL;
-      g_autoptr(GFile) appstream_file = NULL;
-      g_autoptr(GFile) appstream_gz_file = NULL;
-      g_autofree char *commit_checksum = NULL;
-      OstreeRepoTransactionStats stats;
-      g_autoptr(OstreeRepoCommitModifier) modifier = NULL;
-      g_autoptr(FlatpakXml) appstream_root = NULL;
-      g_autoptr(GBytes) xml_data = NULL;
-      g_autoptr(GBytes) xml_gz_data = NULL;
-      const char *compat_arch;
-      g_autoptr(FlatpakRepoTransaction) transaction = NULL;
-      compat_arch = flatpak_get_compat_arch (arch);
-      struct {
-        const char *ignore_filename;
-        const char *branch_prefix;
-      } branch_data[] = {
-        { "appstream.xml", "appstream" },
-        { "appstream.xml.gz", "appstream2" },
-      };
-
-      if (g_mkdtemp_full (tmpdir, 0755) == NULL)
-        return flatpak_fail (error, "Can't create temporary directory");
-
-      tmpdir_file = g_file_new_for_path (tmpdir);
-
-      appstream_root = flatpak_appstream_xml_new ();
-
-      for (i = 0; i < n_keys; i++)
-        {
-          const char *ref = all_refs_keys[i];
-          const char *commit;
-          g_autoptr(GVariant) commit_v = NULL;
-          g_autoptr(GVariant) commit_metadata = NULL;
-          g_auto(GStrv) split = NULL;
-          g_autoptr(GError) my_error = NULL;
-          const char *eol = NULL;
-          const char *eol_rebase = NULL;
-
-          split = flatpak_decompose_ref (ref, NULL);
-          if (!split)
-            continue;
-
-          if (strcmp (split[2], arch) != 0)
-            {
-              g_autofree char *main_ref = NULL;
-              /* Include refs that don't match the main arch (e.g. x86_64), if they match
-                 the compat arch (e.g. i386) and the main arch version is not in the repo */
-              if (g_strcmp0 (split[2], compat_arch) == 0)
-                main_ref = g_strdup_printf ("%s/%s/%s/%s",
-                                            split[0], split[1], arch, split[3]);
-              if (main_ref == NULL ||
-                  g_hash_table_lookup (all_refs, main_ref))
-                continue;
-            }
-
-          commit = g_hash_table_lookup (all_refs, ref);
-
-          if (!ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT, commit,
-                                         &commit_v, NULL))
-            {
-              g_warning ("Couldn't load commit %s (ref %s)", commit, ref);
-              continue;
-            }
-
-          commit_metadata = g_variant_get_child_value (commit_v, 0);
-          g_variant_lookup (commit_metadata, OSTREE_COMMIT_META_KEY_ENDOFLIFE, "&s", &eol);
-          g_variant_lookup (commit_metadata, OSTREE_COMMIT_META_KEY_ENDOFLIFE_REBASE, "&s", &eol_rebase);
-          if (eol || eol_rebase)
-            {
-              g_print (_("%s is end-of-life, ignoring\n"), ref);
+  {
+    g_autofree char *tmpdir = g_strdup ("/tmp/flatpak-appstream-XXXXXX");
+
+    g_autoptr(FlatpakTempDir) tmpdir_file = NULL;
+    g_autoptr(GFile) appstream_file = NULL;
+    g_autoptr(GFile) appstream_gz_file = NULL;
+    g_autofree char *commit_checksum = NULL;
+    OstreeRepoTransactionStats stats;
+    g_autoptr(OstreeRepoCommitModifier) modifier = NULL;
+    g_autoptr(FlatpakXml) appstream_root = NULL;
+    g_autoptr(GBytes) xml_data = NULL;
+    g_autoptr(GBytes) xml_gz_data = NULL;
+    const char *compat_arch;
+    g_autoptr(FlatpakRepoTransaction) transaction = NULL;
+    compat_arch = flatpak_get_compat_arch (arch);
+    struct
+    {
+      const char *ignore_filename;
+      const char *branch_prefix;
+    } branch_data[] = {
+      { "appstream.xml", "appstream" },
+      { "appstream.xml.gz", "appstream2" },
+    };
+
+    if (g_mkdtemp_full (tmpdir, 0755) == NULL)
+      return flatpak_fail (error, "Can't create temporary directory");
+
+    tmpdir_file = g_file_new_for_path (tmpdir);
+
+    appstream_root = flatpak_appstream_xml_new ();
+
+    for (i = 0; i < n_keys; i++)
+      {
+        const char *ref = all_refs_keys[i];
+        const char *commit;
+        g_autoptr(GVariant) commit_v = NULL;
+        g_autoptr(GVariant) commit_metadata = NULL;
+        g_auto(GStrv) split = NULL;
+        g_autoptr(GError) my_error = NULL;
+        const char *eol = NULL;
+        const char *eol_rebase = NULL;
+
+        split = flatpak_decompose_ref (ref, NULL);
+        if (!split)
+          continue;
+
+        if (strcmp (split[2], arch) != 0)
+          {
+            g_autofree char *main_ref = NULL;
+            /* Include refs that don't match the main arch (e.g. x86_64), if they match
+               the compat arch (e.g. i386) and the main arch version is not in the repo */
+            if (g_strcmp0 (split[2], compat_arch) == 0)
+              main_ref = g_strdup_printf ("%s/%s/%s/%s",
+                                          split[0], split[1], arch, split[3]);
+            if (main_ref == NULL ||
+                g_hash_table_lookup (all_refs, main_ref))
               continue;
-            }
+          }
 
-          if (!extract_appstream (repo, appstream_root,
-                                  ref, split[1], tmpdir_file,
-                                  cancellable, &my_error))
-            {
-              if (g_str_has_prefix (ref, "app/"))
-                g_print (_("No appstream data for %s: %s\n"), ref, my_error->message);
-              continue;
-            }
-        }
+        commit = g_hash_table_lookup (all_refs, ref);
 
-      if (!flatpak_appstream_xml_root_to_data (appstream_root, &xml_data, &xml_gz_data, error))
-        return FALSE;
-
-      appstream_file = g_file_get_child (tmpdir_file, "appstream.xml");
-      if (!g_file_replace_contents (appstream_file,
-                                    g_bytes_get_data (xml_data, NULL),
-                                    g_bytes_get_size (xml_data),
-                                    NULL,
-                                    FALSE,
-                                    G_FILE_CREATE_NONE,
-                                    NULL,
-                                    cancellable,
-                                    error))
-        return FALSE;
-
-      appstream_gz_file = g_file_get_child (tmpdir_file, "appstream.xml.gz");
-      if (!g_file_replace_contents (appstream_gz_file,
-                                    g_bytes_get_data (xml_gz_data, NULL),
-                                    g_bytes_get_size (xml_gz_data),
-                                    NULL,
-                                    FALSE,
-                                    G_FILE_CREATE_NONE,
-                                    NULL,
-                                    cancellable,
-                                    error))
-        return FALSE;
+        if (!ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT, commit,
+                                       &commit_v, NULL))
+          {
+            g_warning ("Couldn't load commit %s (ref %s)", commit, ref);
+            continue;
+          }
+
+        commit_metadata = g_variant_get_child_value (commit_v, 0);
+        g_variant_lookup (commit_metadata, OSTREE_COMMIT_META_KEY_ENDOFLIFE, "&s", &eol);
+        g_variant_lookup (commit_metadata, OSTREE_COMMIT_META_KEY_ENDOFLIFE_REBASE, "&s", &eol_rebase);
+        if (eol || eol_rebase)
+          {
+            g_print (_("%s is end-of-life, ignoring\n"), ref);
+            continue;
+          }
+
+        if (!extract_appstream (repo, appstream_root,
+                                ref, split[1], tmpdir_file,
+                                cancellable, &my_error))
+          {
+            if (g_str_has_prefix (ref, "app/"))
+              g_print (_("No appstream data for %s: %s\n"), ref, my_error->message);
+            continue;
+          }
+      }
 
-      transaction = flatpak_repo_transaction_start (repo, cancellable, error);
-      if (transaction == NULL)
-        return FALSE;
+    if (!flatpak_appstream_xml_root_to_data (appstream_root, &xml_data, &xml_gz_data, error))
+      return FALSE;
 
-      for (i = 0; i < G_N_ELEMENTS(branch_data); i++)
-        {
-          gboolean skip_commit = FALSE;
-          const char *ignore_filename = branch_data[i].ignore_filename;
-          const char *branch_prefix = branch_data[i].branch_prefix;
-          g_autoptr(OstreeMutableTree) mtree = NULL;
-          g_autoptr(GFile) root = NULL;
-          g_autofree char *branch = NULL;
-          g_autofree char *parent = NULL;
-
-          branch = g_strdup_printf ("%s/%s", branch_prefix, arch);
-          if (!ostree_repo_resolve_rev (repo, branch, TRUE, &parent, error))
-            return FALSE;
+    appstream_file = g_file_get_child (tmpdir_file, "appstream.xml");
+    if (!g_file_replace_contents (appstream_file,
+                                  g_bytes_get_data (xml_data, NULL),
+                                  g_bytes_get_size (xml_data),
+                                  NULL,
+                                  FALSE,
+                                  G_FILE_CREATE_NONE,
+                                  NULL,
+                                  cancellable,
+                                  error))
+      return FALSE;
 
-          mtree = ostree_mutable_tree_new ();
-          modifier = ostree_repo_commit_modifier_new (OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS |
-                                                      OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS,
-                                                      (OstreeRepoCommitFilter) commit_filter, (gpointer)ignore_filename, NULL);
+    appstream_gz_file = g_file_get_child (tmpdir_file, "appstream.xml.gz");
+    if (!g_file_replace_contents (appstream_gz_file,
+                                  g_bytes_get_data (xml_gz_data, NULL),
+                                  g_bytes_get_size (xml_gz_data),
+                                  NULL,
+                                  FALSE,
+                                  G_FILE_CREATE_NONE,
+                                  NULL,
+                                  cancellable,
+                                  error))
+      return FALSE;
 
-          if (!ostree_repo_write_directory_to_mtree (repo, G_FILE (tmpdir_file), mtree, modifier, cancellable, error))
-            return FALSE;
+    transaction = flatpak_repo_transaction_start (repo, cancellable, error);
+    if (transaction == NULL)
+      return FALSE;
 
-          if (!ostree_repo_write_mtree (repo, mtree, &root, cancellable, error))
-            return FALSE;
+    for (i = 0; i < G_N_ELEMENTS (branch_data); i++)
+      {
+        gboolean skip_commit = FALSE;
+        const char *ignore_filename = branch_data[i].ignore_filename;
+        const char *branch_prefix = branch_data[i].branch_prefix;
+        g_autoptr(OstreeMutableTree) mtree = NULL;
+        g_autoptr(GFile) root = NULL;
+        g_autofree char *branch = NULL;
+        g_autofree char *parent = NULL;
+
+        branch = g_strdup_printf ("%s/%s", branch_prefix, arch);
+        if (!ostree_repo_resolve_rev (repo, branch, TRUE, &parent, error))
+          return FALSE;
 
-          /* No need to commit if nothing changed */
-          if (parent)
-            {
-              g_autoptr(GFile) parent_root;
+        mtree = ostree_mutable_tree_new ();
+        modifier = ostree_repo_commit_modifier_new (OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS |
+                                                    OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS,
+                                                    (OstreeRepoCommitFilter) commit_filter, (gpointer) ignore_filename, NULL);
 
-              if (!ostree_repo_read_commit (repo, parent, &parent_root, NULL, cancellable, error))
-                return FALSE;
+        if (!ostree_repo_write_directory_to_mtree (repo, G_FILE (tmpdir_file), mtree, modifier, cancellable, error))
+          return FALSE;
 
-              if (g_file_equal (root, parent_root))
-                {
-                  skip_commit = TRUE;
-                  g_debug ("Not updating %s, no change", branch);
-                }
-            }
+        if (!ostree_repo_write_mtree (repo, mtree, &root, cancellable, error))
+          return FALSE;
 
-          if (!skip_commit)
-            {
-              g_autoptr(GVariantDict) metadata_dict = NULL;
-              g_autoptr(GVariant) metadata = NULL;
-
-              /* Add bindings to the metadata. Do this even if P2P support is not
-               * enabled, as it might be enable for other flatpak builds. */
-              metadata_dict = g_variant_dict_new (NULL);
-              g_variant_dict_insert (metadata_dict, "ostree.collection-binding",
-                                     "s", (collection_id != NULL) ? collection_id : "");
-              g_variant_dict_insert_value (metadata_dict, "ostree.ref-binding",
-                                           g_variant_new_strv ((const gchar * const *) &branch, 1));
-              metadata = g_variant_ref_sink (g_variant_dict_end (metadata_dict));
-
-              if (timestamp > 0)
-                {
-                  if (!ostree_repo_write_commit_with_time (repo, parent, "Update", NULL, metadata,
-                                                           OSTREE_REPO_FILE (root),
-                                                           timestamp,
-                                                           &commit_checksum,
-                                                           cancellable, error))
-                    return FALSE;
-                }
-              else
-                {
-                  if (!ostree_repo_write_commit (repo, parent, "Update", NULL, metadata,
-                                                 OSTREE_REPO_FILE (root),
-                                                 &commit_checksum, cancellable, error))
-                    return FALSE;
-                }
+        /* No need to commit if nothing changed */
+        if (parent)
+          {
+            g_autoptr(GFile) parent_root;
 
-              if (gpg_key_ids)
-                {
-                  int i;
-
-                  for (i = 0; gpg_key_ids[i] != NULL; i++)
-                    {
-                      const char *keyid = gpg_key_ids[i];
-
-                      if (!ostree_repo_sign_commit (repo,
-                                                    commit_checksum,
-                                                    keyid,
-                                                    gpg_homedir,
-                                                    cancellable,
-                                                    error))
-                        return FALSE;
-                    }
-                }
+            if (!ostree_repo_read_commit (repo, parent, &parent_root, NULL, cancellable, error))
+              return FALSE;
 
-              if (collection_id != NULL)
-                {
-                  const OstreeCollectionRef collection_ref = { (char *) collection_id, branch };
-                  ostree_repo_transaction_set_collection_ref (repo, &collection_ref, commit_checksum);
-                }
-              else
-                {
-                  ostree_repo_transaction_set_ref (repo, NULL, branch, commit_checksum);
-                }
-            }
-        }
+            if (g_file_equal (root, parent_root))
+              {
+                skip_commit = TRUE;
+                g_debug ("Not updating %s, no change", branch);
+              }
+          }
+
+        if (!skip_commit)
+          {
+            g_autoptr(GVariantDict) metadata_dict = NULL;
+            g_autoptr(GVariant) metadata = NULL;
+
+            /* Add bindings to the metadata. Do this even if P2P support is not
+             * enabled, as it might be enable for other flatpak builds. */
+            metadata_dict = g_variant_dict_new (NULL);
+            g_variant_dict_insert (metadata_dict, "ostree.collection-binding",
+                                   "s", (collection_id != NULL) ? collection_id : "");
+            g_variant_dict_insert_value (metadata_dict, "ostree.ref-binding",
+                                         g_variant_new_strv ((const gchar * const *) &branch, 1));
+            metadata = g_variant_ref_sink (g_variant_dict_end (metadata_dict));
+
+            if (timestamp > 0)
+              {
+                if (!ostree_repo_write_commit_with_time (repo, parent, "Update", NULL, metadata,
+                                                         OSTREE_REPO_FILE (root),
+                                                         timestamp,
+                                                         &commit_checksum,
+                                                         cancellable, error))
+                  return FALSE;
+              }
+            else
+              {
+                if (!ostree_repo_write_commit (repo, parent, "Update", NULL, metadata,
+                                               OSTREE_REPO_FILE (root),
+                                               &commit_checksum, cancellable, error))
+                  return FALSE;
+              }
+
+            if (gpg_key_ids)
+              {
+                int i;
+
+                for (i = 0; gpg_key_ids[i] != NULL; i++)
+                  {
+                    const char *keyid = gpg_key_ids[i];
+
+                    if (!ostree_repo_sign_commit (repo,
+                                                  commit_checksum,
+                                                  keyid,
+                                                  gpg_homedir,
+                                                  cancellable,
+                                                  error))
+                      return FALSE;
+                  }
+              }
+
+            if (collection_id != NULL)
+              {
+                const OstreeCollectionRef collection_ref = { (char *) collection_id, branch };
+                ostree_repo_transaction_set_collection_ref (repo, &collection_ref, commit_checksum);
+              }
+            else
+              {
+                ostree_repo_transaction_set_ref (repo, NULL, branch, commit_checksum);
+              }
+          }
+      }
 
-      if (!ostree_repo_commit_transaction (repo, &stats, cancellable, error))
-        return FALSE;
-    }
+    if (!ostree_repo_commit_transaction (repo, &stats, cancellable, error))
+      return FALSE;
+  }
 
   return TRUE;
 }
@@ -3946,8 +3961,8 @@ flatpak_extension_free (FlatpakExtension *extension)
 }
 
 static int
-flatpak_extension_compare (gconstpointer  _a,
-                           gconstpointer  _b)
+flatpak_extension_compare (gconstpointer _a,
+                           gconstpointer _b)
 {
   const FlatpakExtension *a = _a;
   const FlatpakExtension *b = _b;
@@ -3962,12 +3977,13 @@ flatpak_extension_new (const char *id,
                        const char *directory,
                        const char *add_ld_path,
                        const char *subdir_suffix,
-                       char **merge_dirs,
-                       GFile *files,
-                       GFile *deploy_dir,
-                       gboolean is_unmaintained)
+                       char      **merge_dirs,
+                       GFile      *files,
+                       GFile      *deploy_dir,
+                       gboolean    is_unmaintained)
 {
   FlatpakExtension *ext = g_new0 (FlatpakExtension, 1);
+
   g_autoptr(GVariant) deploy_data = NULL;
 
   ext->id = g_strdup (id);
@@ -4007,7 +4023,7 @@ flatpak_extension_new (const char *id,
 gboolean
 flatpak_extension_matches_reason (const char *extension_id,
                                   const char *reason,
-                                  gboolean default_value)
+                                  gboolean    default_value)
 {
   const char *extension_basename;
 
@@ -4036,7 +4052,7 @@ flatpak_extension_matches_reason (const char *extension_id,
   else if (strcmp (reason, "active-gtk-theme") == 0)
     {
       const char *gtk_theme = flatpak_get_gtk_theme ();
-      return (strcmp (gtk_theme, extension_basename) == 0);
+      return strcmp (gtk_theme, extension_basename) == 0;
     }
   else if (strcmp (reason, "have-intel-gpu") == 0)
     {
@@ -4053,7 +4069,7 @@ add_extension (GKeyFile   *metakey,
                const char *extension,
                const char *arch,
                const char *branch,
-               GList *res)
+               GList      *res)
 {
   FlatpakExtension *ext;
   g_autofree char *directory = g_key_file_get_string (metakey, group,
@@ -4062,6 +4078,7 @@ add_extension (GKeyFile   *metakey,
   g_autofree char *add_ld_path = g_key_file_get_string (metakey, group,
                                                         FLATPAK_METADATA_KEY_ADD_LD_PATH,
                                                         NULL);
+
   g_auto(GStrv) merge_dirs = g_key_file_get_string_list (metakey, group,
                                                          FLATPAK_METADATA_KEY_MERGE_DIRS,
                                                          NULL, NULL);
@@ -4150,9 +4167,9 @@ add_extension (GKeyFile   *metakey,
 }
 
 void
-flatpak_parse_extension_with_tag (const char  *extension,
-                                  char       **name,
-                                  char       **tag)
+flatpak_parse_extension_with_tag (const char *extension,
+                                  char      **name,
+                                  char      **tag)
 {
   const char *tag_chr = strchr (extension, '@');
 
@@ -4210,7 +4227,7 @@ flatpak_list_extensions (GKeyFile   *metakey,
           flatpak_parse_extension_with_tag (extension, &name, NULL);
 
           if (versions)
-            branches = (const char **)versions;
+            branches = (const char **) versions;
           else
             {
               if (version)
@@ -4512,6 +4529,7 @@ static guint64
 flatpak_bundle_get_installed_size (GVariant *bundle, gboolean byte_swap)
 {
   guint64 total_usize = 0;
+
   g_autoptr(GVariant) meta_entries = NULL;
   guint i, n_parts;
 
@@ -4769,17 +4787,18 @@ flatpak_pull_from_bundle (OstreeRepo   *repo,
   return TRUE;
 }
 
-typedef struct {
+typedef struct
+{
   FlatpakOciPullProgress progress_cb;
-  gpointer progress_user_data;
-  guint64 total_size;
-  guint64 previous_layers_size;
-  guint32 n_layers;
-  guint32 pulled_layers;
+  gpointer               progress_user_data;
+  guint64                total_size;
+  guint64                previous_layers_size;
+  guint32                n_layers;
+  guint32                pulled_layers;
 } FlatpakOciPullProgressData;
 
 static void
-oci_layer_progress (guint64 downloaded_bytes,
+oci_layer_progress (guint64  downloaded_bytes,
                     gpointer user_data)
 {
   FlatpakOciPullProgressData *progress_data = user_data;
@@ -4791,16 +4810,17 @@ oci_layer_progress (guint64 downloaded_bytes,
 }
 
 gboolean
-flatpak_mirror_image_from_oci (FlatpakOciRegistry *dst_registry,
-                               FlatpakOciRegistry *registry,
-			       const char *oci_repository,
-                               const char *digest,
+flatpak_mirror_image_from_oci (FlatpakOciRegistry    *dst_registry,
+                               FlatpakOciRegistry    *registry,
+                               const char            *oci_repository,
+                               const char            *digest,
                                FlatpakOciPullProgress progress_cb,
-                               gpointer progress_user_data,
-                               GCancellable *cancellable,
-                               GError      **error)
+                               gpointer               progress_user_data,
+                               GCancellable          *cancellable,
+                               GError               **error)
 {
   FlatpakOciPullProgressData progress_data = { progress_cb, progress_user_data };
+
   g_autoptr(FlatpakOciVersioned) versioned = NULL;
   FlatpakOciManifest *manifest = NULL;
   g_autoptr(FlatpakOciDescriptor) manifest_desc = NULL;
@@ -4874,17 +4894,17 @@ flatpak_mirror_image_from_oci (FlatpakOciRegistry *dst_registry,
 
 
 char *
-flatpak_pull_from_oci (OstreeRepo   *repo,
-                       FlatpakOciRegistry *registry,
-                       const char *oci_repository,
-                       const char *digest,
-                       FlatpakOciManifest *manifest,
-                       const char *remote,
-                       const char *ref,
+flatpak_pull_from_oci (OstreeRepo            *repo,
+                       FlatpakOciRegistry    *registry,
+                       const char            *oci_repository,
+                       const char            *digest,
+                       FlatpakOciManifest    *manifest,
+                       const char            *remote,
+                       const char            *ref,
                        FlatpakOciPullProgress progress_cb,
-                       gpointer progress_user_data,
-                       GCancellable *cancellable,
-                       GError      **error)
+                       gpointer               progress_user_data,
+                       GCancellable          *cancellable,
+                       GError               **error)
 {
   g_autoptr(OstreeMutableTree) archive_mtree = NULL;
   g_autoptr(GFile) archive_root = NULL;
@@ -4923,7 +4943,7 @@ flatpak_pull_from_oci (OstreeRepo   *repo,
     }
 
   g_variant_builder_add (metadata_builder, "{s@v}", "xa.alt-id",
-                         g_variant_new_variant (g_variant_new_string (digest + strlen("sha256:"))));
+                         g_variant_new_variant (g_variant_new_string (digest + strlen ("sha256:"))));
 
   if (!ostree_repo_prepare_transaction (repo, NULL, cancellable, error))
     return NULL;
@@ -4957,7 +4977,7 @@ flatpak_pull_from_oci (OstreeRepo   *repo,
       opts.ignore_unsupported_content = TRUE;
 
       layer_fd = flatpak_oci_registry_download_blob (registry, oci_repository, FALSE,
-						     layer->digest,
+                                                     layer->digest,
                                                      oci_layer_progress, &progress_data,
                                                      cancellable, error);
       if (layer_fd == -1)
@@ -5027,7 +5047,7 @@ flatpak_pull_from_oci (OstreeRepo   *repo,
 
   return g_steal_pointer (&commit_checksum);
 
- error:
+error:
 
   ostree_repo_abort_transaction (repo, cancellable, NULL);
   return NULL;
@@ -5197,12 +5217,12 @@ flatpak_yes_no_prompt (const char *prompt, ...)
         return FALSE;
 
       g_strstrip (buf);
-      if (g_ascii_strcasecmp  (buf, "y") == 0 ||
-          g_ascii_strcasecmp  (buf, "yes") == 0)
+      if (g_ascii_strcasecmp (buf, "y") == 0 ||
+          g_ascii_strcasecmp (buf, "yes") == 0)
         return TRUE;
 
-      if (g_ascii_strcasecmp  (buf, "n") == 0 ||
-          g_ascii_strcasecmp  (buf, "no") == 0)
+      if (g_ascii_strcasecmp (buf, "n") == 0 ||
+          g_ascii_strcasecmp (buf, "no") == 0)
         return FALSE;
     }
 }
@@ -5260,18 +5280,19 @@ flatpak_number_prompt (int min, int max, const char *prompt, ...)
 }
 
 
-typedef struct {
-  GMainLoop *loop;
-  GError *error;
-  GOutputStream *out;
-  guint64 downloaded_bytes;
-  GString *content;
-  char buffer[16*1024];
+typedef struct
+{
+  GMainLoop             *loop;
+  GError                *error;
+  GOutputStream         *out;
+  guint64                downloaded_bytes;
+  GString               *content;
+  char                   buffer[16 * 1024];
   FlatpakLoadUriProgress progress;
-  GCancellable *cancellable;
-  gpointer user_data;
-  guint64 last_progress_time;
-  char *etag;
+  GCancellable          *cancellable;
+  gpointer               user_data;
+  guint64                last_progress_time;
+  char                  *etag;
 } LoadUriData;
 
 static void
@@ -5279,6 +5300,7 @@ stream_closed (GObject *source, GAsyncResult *res, gpointer user_data)
 {
   LoadUriData *data = user_data;
   GInputStream *stream = G_INPUT_STREAM (source);
+
   g_autoptr(GError) error = NULL;
 
   if (!g_input_stream_close_finish (stream, res, &error))
@@ -5340,11 +5362,12 @@ load_uri_read_cb (GObject *source, GAsyncResult *res, gpointer user_data)
 }
 
 static void
-load_uri_callback (GObject *source_object,
+load_uri_callback (GObject      *source_object,
                    GAsyncResult *res,
-                   gpointer user_data)
+                   gpointer      user_data)
 {
-  SoupRequestHTTP *request = SOUP_REQUEST_HTTP(source_object);
+  SoupRequestHTTP *request = SOUP_REQUEST_HTTP (source_object);
+
   g_autoptr(GInputStream) in = NULL;
   LoadUriData *data = user_data;
 
@@ -5355,7 +5378,7 @@ load_uri_callback (GObject *source_object,
       return;
     }
 
-  g_autoptr(SoupMessage) msg = soup_request_http_get_message ((SoupRequestHTTP*) request);
+  g_autoptr(SoupMessage) msg = soup_request_http_get_message ((SoupRequestHTTP *) request);
   if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code))
     {
       int code;
@@ -5367,10 +5390,12 @@ load_uri_callback (GObject *source_object,
           domain = FLATPAK_OCI_ERROR;
           code = FLATPAK_OCI_ERROR_NOT_CHANGED;
           break;
+
         case 404:
         case 410:
           code = G_IO_ERROR_NOT_FOUND;
           break;
+
         default:
           code = G_IO_ERROR_FAILED;
         }
@@ -5417,17 +5442,18 @@ flatpak_create_soup_session (const char *user_agent)
 }
 
 GBytes *
-flatpak_load_http_uri (SoupSession *soup_session,
-                       const char *uri,
-		       FlatpakHTTPFlags flags,
-                       const char *etag,
-                       char      **out_etag,
+flatpak_load_http_uri (SoupSession           *soup_session,
+                       const char            *uri,
+                       FlatpakHTTPFlags       flags,
+                       const char            *etag,
+                       char                 **out_etag,
                        FlatpakLoadUriProgress progress,
-                       gpointer      user_data,
-                       GCancellable *cancellable,
-                       GError      **error)
+                       gpointer               user_data,
+                       GCancellable          *cancellable,
+                       GError               **error)
 {
   GBytes *bytes = NULL;
+
   g_autoptr(GMainContext) context = NULL;
   g_autoptr(SoupRequestHTTP) request = NULL;
   g_autoptr(GMainLoop) loop = NULL;
@@ -5458,9 +5484,9 @@ flatpak_load_http_uri (SoupSession *soup_session,
 
   if (flags & FLATPAK_HTTP_FLAGS_ACCEPT_OCI)
     soup_message_headers_replace (m->request_headers, "Accept",
-				  "application/vnd.oci.image.manifest.v1+json");
+                                  "application/vnd.oci.image.manifest.v1+json");
 
-  soup_request_send_async (SOUP_REQUEST(request),
+  soup_request_send_async (SOUP_REQUEST (request),
                            cancellable,
                            load_uri_callback, &data);
 
@@ -5485,14 +5511,14 @@ flatpak_load_http_uri (SoupSession *soup_session,
 }
 
 gboolean
-flatpak_download_http_uri (SoupSession *soup_session,
-                           const char   *uri,
-			   FlatpakHTTPFlags flags,
-                           GOutputStream *out,
+flatpak_download_http_uri (SoupSession           *soup_session,
+                           const char            *uri,
+                           FlatpakHTTPFlags       flags,
+                           GOutputStream         *out,
                            FlatpakLoadUriProgress progress,
-                           gpointer      user_data,
-                           GCancellable *cancellable,
-                           GError      **error)
+                           gpointer               user_data,
+                           GCancellable          *cancellable,
+                           GError               **error)
 {
   g_autoptr(SoupRequestHTTP) request = NULL;
   g_autoptr(GMainLoop) loop = NULL;
@@ -5520,9 +5546,9 @@ flatpak_download_http_uri (SoupSession *soup_session,
   m = soup_request_http_get_message (request);
   if (flags & FLATPAK_HTTP_FLAGS_ACCEPT_OCI)
     soup_message_headers_replace (m->request_headers, "Accept",
-				  "application/vnd.oci.image.manifest.v1+json");
+                                  "application/vnd.oci.image.manifest.v1+json");
 
-  soup_request_send_async (SOUP_REQUEST(request),
+  soup_request_send_async (SOUP_REQUEST (request),
                            cancellable,
                            load_uri_callback, &data);
 
@@ -5578,7 +5604,7 @@ flatpak_subpaths_merge (char **subpaths1,
   g_ptr_array_sort (array, flatpak_strcmp0_ptr);
   g_ptr_array_add (array, NULL);
 
-  return (char **)g_ptr_array_free (array, FALSE);
+  return (char **) g_ptr_array_free (array, FALSE);
 }
 
 char *
@@ -5606,10 +5632,11 @@ flatpak_get_lang_from_locale (const char *locale)
 gboolean
 flatpak_g_ptr_array_contains_string (GPtrArray *array, const char *str)
 {
-  int i ;
+  int i;
+
   for (i = 0; i < array->len; i++)
     {
-      if (strcmp (g_ptr_array_index(array, i), str) == 0)
+      if (strcmp (g_ptr_array_index (array, i), str) == 0)
         return TRUE;
     }
   return FALSE;
@@ -5632,7 +5659,7 @@ flatpak_get_current_locale_langs (void)
   g_ptr_array_sort (langs, flatpak_strcmp0_ptr);
   g_ptr_array_add (langs, NULL);
 
-  return (char **)g_ptr_array_free (langs, FALSE);
+  return (char **) g_ptr_array_free (langs, FALSE);
 }
 
 static inline guint
@@ -5812,13 +5839,14 @@ progress_cb (OstreeAsyncProgress *progress, gpointer user_data)
              total size. */
           double average_object_size = 1;
           if (fetched > 0)
-            average_object_size = bytes_transferred / (double)fetched;
+            average_object_size = bytes_transferred / (double) fetched;
 
           total = average_object_size * requested + total_extra_data_bytes;
 
           if (downloading_extra_data)
             {
-              g_autofree gchar *formatted_bytes_total = g_format_size_full (total, 0);;
+              g_autofree gchar *formatted_bytes_total = g_format_size_full (total, 0);
+              ;
               g_string_append_printf (buf, _("Downloading extra data: %s/%s"),
                                       formatted_bytes_total_transferred,
                                       formatted_bytes_total);
@@ -5829,11 +5857,14 @@ progress_cb (OstreeAsyncProgress *progress, gpointer user_data)
         }
 
       /* The download progress goes up to 97% */
-      if (total > 0) {
-        new_progress = 5 + ((total_transferred / (gdouble) total) * 92);
-      } else {
-        new_progress = 97;
-      }
+      if (total > 0)
+        {
+          new_progress = 5 + ((total_transferred / (gdouble) total) * 92);
+        }
+      else
+        {
+          new_progress = 97;
+        }
 
       /* And the writing of the objects adds 3% to the progress */
       new_progress += get_write_progress (outstanding_writes);
@@ -5862,6 +5893,7 @@ flatpak_progress_new (FlatpakProgressCallback progress,
   OstreeAsyncProgress *ostree_progress =
     ostree_async_progress_new_and_connect (progress_cb,
                                            progress_data);
+
   g_object_set_data (G_OBJECT (ostree_progress), "callback", progress);
   g_object_set_data (G_OBJECT (ostree_progress), "last_progress", GUINT_TO_POINTER (0));
 
@@ -5887,8 +5919,8 @@ flatpak_log_dir_access (FlatpakDir *dir)
 
 gboolean
 flatpak_check_required_version (const char *ref,
-                                GKeyFile *metakey,
-                                GError **error)
+                                GKeyFile   *metakey,
+                                GError    **error)
 {
   g_autofree char *required_version = NULL;
   const char *group;
diff --git a/common/test-lib.c b/common/test-lib.c
index b4772a39..defd36b2 100644
--- a/common/test-lib.c
+++ b/common/test-lib.c
@@ -49,9 +49,9 @@ main (int argc, char *argv[])
       const char *list[] = { "gnome-apps", "app/org.gnome.iagno/x86_64/stable",
                              "gnome", "runtime/org.gnome.Sdk/x86_64/3.20" };
 
-      for (j = 0; j < G_N_ELEMENTS(list); j += 2)
+      for (j = 0; j < G_N_ELEMENTS (list); j += 2)
         {
-          g_print ("looking for related to ref: %s\n", list[j+1]);
+          g_print ("looking for related to ref: %s\n", list[j + 1]);
 
           for (k = 0; k < 2; k++)
             {
@@ -62,13 +62,13 @@ main (int argc, char *argv[])
               if (k == 0)
                 related = flatpak_installation_list_remote_related_refs_sync (installation,
                                                                               list[j],
-                                                                              list[j+1],
+                                                                              list[j + 1],
                                                                               NULL,
                                                                               &error);
               else
                 related = flatpak_installation_list_installed_related_refs_sync (installation,
                                                                                  list[j],
-                                                                                 list[j+1],
+                                                                                 list[j + 1],
                                                                                  NULL,
                                                                                  &error);
 
diff --git a/dbus-proxy/dbus-proxy.c b/dbus-proxy/dbus-proxy.c
index b6a21609..d0be7c4f 100644
--- a/dbus-proxy/dbus-proxy.c
+++ b/dbus-proxy/dbus-proxy.c
@@ -34,9 +34,9 @@ static GList *proxies;
 static int sync_fd = -1;
 
 static void
-add_args (GBytes *bytes,
+add_args (GBytes    *bytes,
           GPtrArray *args,
-          int pos)
+          int        pos)
 {
   gsize data_len, remainder_len;
   const guchar *data = g_bytes_get_data (bytes, &data_len);
@@ -49,7 +49,7 @@ add_args (GBytes *bytes,
   while (s)
     {
       gsize len = s - remainder;
-      char *arg = g_strndup ((char *)remainder, len);
+      char *arg = g_strndup ((char *) remainder, len);
       g_ptr_array_insert (args, pos++, arg);
       remainder = s + 1;
       remainder_len -= len + 1;
@@ -58,7 +58,7 @@ add_args (GBytes *bytes,
 
   if (remainder_len)
     {
-      char *arg = g_strndup ((char *)remainder, remainder_len);
+      char *arg = g_strndup ((char *) remainder, remainder_len);
       g_ptr_array_insert (args, pos++, arg);
     }
 }
@@ -131,7 +131,7 @@ start_proxy (GPtrArray *args, int *args_i)
   const char *bus_address, *socket_path;
   const char *arg;
 
-  if (*args_i >= args->len || ((char *)g_ptr_array_index (args, *args_i))[0] == '-')
+  if (*args_i >= args->len || ((char *) g_ptr_array_index (args, *args_i))[0] == '-')
     {
       g_printerr ("No bus address given\n");
       return FALSE;
@@ -140,7 +140,7 @@ start_proxy (GPtrArray *args, int *args_i)
   bus_address = g_ptr_array_index (args, *args_i);
   *args_i += 1;
 
-  if (*args_i >= args->len || ((char *)g_ptr_array_index (args, *args_i))[0] == '-')
+  if (*args_i >= args->len || ((char *) g_ptr_array_index (args, *args_i))[0] == '-')
     {
       g_printerr ("No socket path given\n");
       return FALSE;
@@ -272,10 +272,11 @@ main (int argc, const char *argv[])
 {
   GMainLoop *service_loop;
   int i, args_i;
+
   g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);
 
   for (i = 1; i < argc; i++)
-    g_ptr_array_add (args, g_strdup ((char *)argv[i]));
+    g_ptr_array_add (args, g_strdup ((char *) argv[i]));
 
   args_i = 0;
   while (args_i < args->len)
diff --git a/dbus-proxy/flatpak-proxy.c b/dbus-proxy/flatpak-proxy.c
index af17d315..c05b688a 100644
--- a/dbus-proxy/flatpak-proxy.c
+++ b/dbus-proxy/flatpak-proxy.c
@@ -232,24 +232,24 @@ typedef struct
 } Header;
 
 typedef enum {
-  FILTER_TYPE_CALL = 1<<0,
-  FILTER_TYPE_BROADCAST = 1<<1,
+  FILTER_TYPE_CALL = 1 << 0,
+  FILTER_TYPE_BROADCAST = 1 << 1,
 } FilterTypeMask;
 
-#define FILTER_TYPE_ALL (FILTER_TYPE_CALL|FILTER_TYPE_BROADCAST)
+#define FILTER_TYPE_ALL (FILTER_TYPE_CALL | FILTER_TYPE_BROADCAST)
 
 typedef struct
 {
-  char *name;
-  gboolean name_is_subtree;
+  char         *name;
+  gboolean      name_is_subtree;
   FlatpakPolicy policy;
 
   /* More detailed filter */
   FilterTypeMask types;
-  char *path;
-  gboolean path_is_subtree;
-  char *interface;
-  char *member;
+  char          *path;
+  gboolean       path_is_subtree;
+  char          *interface;
+  char          *member;
 } Filter;
 
 static void header_free (Header *header);
@@ -352,7 +352,7 @@ static void stop_reading (ProxySide *side);
 static void
 string_list_free (GList *filters)
 {
-  g_list_free_full (filters, (GDestroyNotify)g_free);
+  g_list_free_full (filters, (GDestroyNotify) g_free);
 }
 
 static void
@@ -442,7 +442,7 @@ flatpak_proxy_client_init (FlatpakProxyClient *client)
   client->rewrite_reply = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_object_unref);
   client->get_owner_reply = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
   client->unique_id_policy = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-  client->unique_id_owned_names = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)string_list_free);
+  client->unique_id_owned_names = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) string_list_free);
 }
 
 static FlatpakProxyClient *
@@ -495,13 +495,13 @@ filter_free (Filter *filter)
 static void
 filter_list_free (GList *filters)
 {
-  g_list_free_full (filters, (GDestroyNotify)filter_free);
+  g_list_free_full (filters, (GDestroyNotify) filter_free);
 }
 
 
 static Filter *
-filter_new (const char *name,
-            gboolean name_is_subtree,
+filter_new (const char   *name,
+            gboolean      name_is_subtree,
             FlatpakPolicy policy)
 {
   Filter *filter = g_new0 (Filter, 1);
@@ -516,10 +516,10 @@ filter_new (const char *name,
 
 // rules are of the form [*|org.the.interface.[method|*]]|[@/obj/path[/*]]
 static Filter *
-filter_new_from_rule (const char *name,
-                      gboolean name_is_subtree,
+filter_new_from_rule (const char    *name,
+                      gboolean       name_is_subtree,
                       FilterTypeMask types,
-                      const char *rule)
+                      const char    *rule)
 {
   Filter *filter;
   const char *obj_path_start = NULL;
@@ -543,7 +543,7 @@ filter_new_from_rule (const char *name,
   if (obj_path_start != NULL)
     method_end = obj_path_start;
   else
-    method_end = rule + strlen(rule);
+    method_end = rule + strlen (rule);
 
   if (method_end != rule)
     {
@@ -558,7 +558,7 @@ filter_new_from_rule (const char *name,
           if (dot != NULL)
             {
               *dot = 0;
-              if (strcmp (dot+1, "*") != 0)
+              if (strcmp (dot + 1, "*") != 0)
                 filter->member = g_strdup (dot + 1);
             }
         }
@@ -568,11 +568,11 @@ filter_new_from_rule (const char *name,
 }
 
 static gboolean
-filter_matches (Filter *filter,
+filter_matches (Filter        *filter,
                 FilterTypeMask type,
-                const char *path,
-                const char *interface,
-                const char *member)
+                const char    *path,
+                const char    *interface,
+                const char    *member)
 {
   if ((filter->types & type) == 0)
     return FALSE;
@@ -603,11 +603,11 @@ filter_matches (Filter *filter,
 }
 
 static gboolean
-any_filter_matches (GList *filters,
+any_filter_matches (GList         *filters,
                     FilterTypeMask type,
-                    const char *path,
-                    const char *interface,
-                    const char *member)
+                    const char    *path,
+                    const char    *interface,
+                    const char    *member)
 {
   GList *l;
 
@@ -624,13 +624,13 @@ any_filter_matches (GList *filters,
 
 static void
 flatpak_proxy_add_filter (FlatpakProxy *proxy,
-                          Filter *filter)
+                          Filter       *filter)
 {
   GList *filters, *new_filters;
 
   if (g_hash_table_lookup_extended (proxy->filters,
                                     filter->name,
-                                    NULL, (void **)&filters))
+                                    NULL, (void **) &filters))
     {
       new_filters = g_list_append (filters, filter);
       g_assert (new_filters == filters);
@@ -645,7 +645,7 @@ flatpak_proxy_add_filter (FlatpakProxy *proxy,
 void
 flatpak_proxy_add_policy (FlatpakProxy *proxy,
                           const char   *name,
-                          gboolean name_is_subtree,
+                          gboolean      name_is_subtree,
                           FlatpakPolicy policy)
 {
   Filter *filter = filter_new (name, name_is_subtree, policy);
@@ -656,7 +656,7 @@ flatpak_proxy_add_policy (FlatpakProxy *proxy,
 void
 flatpak_proxy_add_call_rule (FlatpakProxy *proxy,
                              const char   *name,
-                             gboolean name_is_subtree,
+                             gboolean      name_is_subtree,
                              const char   *rule)
 {
   Filter *filter = filter_new_from_rule (name, name_is_subtree, FILTER_TYPE_CALL, rule);
@@ -667,7 +667,7 @@ flatpak_proxy_add_call_rule (FlatpakProxy *proxy,
 void
 flatpak_proxy_add_broadcast_rule (FlatpakProxy *proxy,
                                   const char   *name,
-                                  gboolean name_is_subtree,
+                                  gboolean      name_is_subtree,
                                   const char   *rule)
 {
   Filter *filter = filter_new_from_rule (name, name_is_subtree, FILTER_TYPE_BROADCAST, rule);
@@ -1134,6 +1134,7 @@ parse_header (Buffer *buffer, guint32 serial_offset, guint32 reply_serial_offset
   guint8 header_type;
   guint32 reply_serial_pos = 0;
   const char *signature;
+
   g_autoptr(Header) header = g_new0 (Header, 1);
 
   header->buffer = buffer_ref (buffer);
@@ -1402,13 +1403,13 @@ print_incoming_header (Header *header)
 }
 
 
-static Filter *match_all[FLATPAK_POLICY_OWN+1] = { NULL };
+static Filter *match_all[FLATPAK_POLICY_OWN + 1] = { NULL };
 
 
 static FlatpakPolicy
 flatpak_proxy_client_get_max_policy_and_matched (FlatpakProxyClient *client,
-                                                 const char *source,
-                                                 GList **matched_filters)
+                                                 const char         *source,
+                                                 GList             **matched_filters)
 {
   GList *names, *filters, *l;
   FlatpakPolicy max_policy = FLATPAK_POLICY_NONE;
@@ -1480,7 +1481,7 @@ flatpak_proxy_client_get_max_policy_and_matched (FlatpakProxyClient *client,
 
 static FlatpakPolicy
 flatpak_proxy_client_get_max_policy (FlatpakProxyClient *client,
-                                     const char *source)
+                                     const char         *source)
 {
   return flatpak_proxy_client_get_max_policy_and_matched (client, source, NULL);
 }
@@ -1511,7 +1512,7 @@ flatpak_proxy_client_add_unique_id_owned_name (FlatpakProxyClient *client,
   names = NULL;
   already_added = g_hash_table_lookup_extended (client->unique_id_owned_names,
                                                 unique_id,
-                                                NULL, (void **)&names);
+                                                NULL, (void **) &names);
   names = g_list_append (names, g_strdup (owned_name));
 
   if (!already_added)
@@ -1660,6 +1661,7 @@ get_dbus_method_handler (FlatpakProxyClient *client, Header *header)
 {
   FlatpakPolicy policy;
   const char *method;
+
   g_autoptr(GList) filters = NULL;
 
   if (header->has_reply_serial)
@@ -1773,6 +1775,7 @@ get_arg0_string (Buffer *buffer)
 {
   GDBusMessage *message = g_dbus_message_new_from_blob (buffer->data, buffer->size, 0, NULL);
   GVariant *body;
+
   g_autoptr(GVariant) arg0 = NULL;
   char *name = NULL;
 
@@ -2132,7 +2135,8 @@ got_buffer_from_client (FlatpakProxyClient *client, ProxySide *side, Buffer *buf
 
   if (client->authenticated && client->proxy->filter)
     {
-      g_autoptr(Header) header = NULL;;
+      g_autoptr(Header) header = NULL;
+      ;
       BusHandler handler;
 
       /* Filter and rewrite outgoing messages as needed */
@@ -2300,7 +2304,8 @@ got_buffer_from_bus (FlatpakProxyClient *client, ProxySide *side, Buffer *buffer
 {
   if (client->authenticated && client->proxy->filter)
     {
-      g_autoptr(Header) header = NULL;;
+      g_autoptr(Header) header = NULL;
+      ;
       GDBusMessage *rewritten;
       FlatpakPolicy policy;
       ExpectedReplyType expected_reply;
@@ -2506,7 +2511,7 @@ auth_line_is_valid (guint8 *line, guint8 *line_end)
 
   for (p = line; p < line_end; p++)
     {
-      if (!_DBUS_ISASCII(*p))
+      if (!_DBUS_ISASCII (*p))
         return FALSE;
 
       /* Technically, the dbus spec allows all ASCII characters, but for robustness we also
@@ -2531,14 +2536,14 @@ auth_line_is_begin (guint8 *line)
 {
   guint8 next_char;
 
-  if (!g_str_has_prefix ((char *)line, AUTH_BEGIN))
+  if (!g_str_has_prefix ((char *) line, AUTH_BEGIN))
     return FALSE;
 
   /* dbus-daemon accepts either nothing, or a whitespace followed by anything as end of auth */
   next_char = line[strlen (AUTH_BEGIN)];
-  return (next_char == 0 ||
-          next_char == ' ' ||
-          next_char == '\t');
+  return next_char == 0 ||
+         next_char == ' ' ||
+         next_char == '\t';
 }
 
 static gssize
@@ -2577,7 +2582,7 @@ find_auth_end (FlatpakProxyClient *client, Buffer *buffer)
           g_byte_array_remove_range (client->auth_buffer, 0, offset);
 
           /* Abort if more than 16k before newline, similar to what dbus-daemon does */
-          if (client->auth_buffer->len >= 16*1024)
+          if (client->auth_buffer->len >= 16 * 1024)
             return FIND_AUTH_END_ABORT;
 
           return FIND_AUTH_END_CONTINUE;
@@ -2608,7 +2613,7 @@ side_in_cb (GSocket *socket, GIOCondition condition, gpointer user_data)
       if (!buffer_read (side, buffer, socket))
         {
           if (buffer != side->current_read_buffer)
-              buffer_unref (buffer);
+            buffer_unref (buffer);
           break;
         }
 
@@ -2766,7 +2771,7 @@ flatpak_proxy_incoming (GSocketService    *service,
 static void
 flatpak_proxy_init (FlatpakProxy *proxy)
 {
-  proxy->filters = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)filter_list_free);
+  proxy->filters = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) filter_list_free);
   flatpak_proxy_add_policy (proxy, "org.freedesktop.DBus", FALSE, FLATPAK_POLICY_TALK);
 }
 
diff --git a/dbus-proxy/flatpak-proxy.h b/dbus-proxy/flatpak-proxy.h
index c76561ea..a42b507e 100644
--- a/dbus-proxy/flatpak-proxy.h
+++ b/dbus-proxy/flatpak-proxy.h
@@ -51,16 +51,16 @@ void         flatpak_proxy_set_sloppy_names (FlatpakProxy *proxy,
                                              gboolean      sloppy_names);
 void         flatpak_proxy_add_policy (FlatpakProxy *proxy,
                                        const char   *name,
-                                       gboolean name_is_subtree,
+                                       gboolean      name_is_subtree,
                                        FlatpakPolicy policy);
 void         flatpak_proxy_add_call_rule (FlatpakProxy *proxy,
                                           const char   *name,
-                                          gboolean name_is_subtree,
+                                          gboolean      name_is_subtree,
                                           const char   *rule);
 void         flatpak_proxy_add_broadcast_rule (FlatpakProxy *proxy,
                                                const char   *name,
-                                               gboolean name_is_subtree,
-                                          const char   *rule);
+                                               gboolean      name_is_subtree,
+                                               const char   *rule);
 gboolean     flatpak_proxy_start (FlatpakProxy *proxy,
                                   GError      **error);
 void         flatpak_proxy_stop (FlatpakProxy *proxy);
diff --git a/portal/flatpak-portal-app-info.c b/portal/flatpak-portal-app-info.c
index 1776bd69..fec4ceb8 100644
--- a/portal/flatpak-portal-app-info.c
+++ b/portal/flatpak-portal-app-info.c
@@ -75,6 +75,7 @@ parse_app_id_from_fileinfo (int pid)
   glnx_autofd int root_fd = -1;
   glnx_autofd int info_fd = -1;
   struct stat stat_buf;
+
   g_autoptr(GError) local_error = NULL;
   g_autoptr(GMappedFile) mapped = NULL;
   g_autoptr(GKeyFile) metadata = NULL;
@@ -84,7 +85,7 @@ parse_app_id_from_fileinfo (int pid)
   if (root_fd == -1)
     {
       /* Not able to open the root dir shouldn't happen. Probably the app died and
-         *we're failing due to /proc/$pid not existing. In that case fail instead
+       * we're failing due to /proc/$pid not existing. In that case fail instead
          of treating this as privileged. */
       g_debug ("Unable to open %s", root_path);
       return NULL;
@@ -109,7 +110,7 @@ parse_app_id_from_fileinfo (int pid)
   if (fstat (info_fd, &stat_buf) != 0 || !S_ISREG (stat_buf.st_mode))
     return NULL; /* Some weird fd => failure */
 
-  mapped = g_mapped_file_new_from_fd  (info_fd, FALSE, &local_error);
+  mapped = g_mapped_file_new_from_fd (info_fd, FALSE, &local_error);
   if (mapped == NULL)
     {
       g_warning ("Can't map .flatpak-info file: %s", local_error->message);
@@ -135,6 +136,7 @@ flatpak_invocation_lookup_app_info (GDBusMethodInvocation *invocation,
 {
   GDBusConnection *connection = g_dbus_method_invocation_get_connection (invocation);
   const gchar *sender = g_dbus_method_invocation_get_sender (invocation);
+
   g_autoptr(GDBusMessage) msg = NULL;
   g_autoptr(GDBusMessage) reply = NULL;
   g_autoptr(GVariantIter) iter = NULL;
diff --git a/portal/flatpak-portal.c b/portal/flatpak-portal.c
index 03c5f3e5..a4535073 100644
--- a/portal/flatpak-portal.c
+++ b/portal/flatpak-portal.c
@@ -33,7 +33,7 @@
 #include "flatpak-portal-app-info.h"
 #include "flatpak-portal-error.h"
 
-#define IDLE_TIMEOUT_SECS 10*60
+#define IDLE_TIMEOUT_SECS 10 * 60
 
 static GHashTable *client_pid_data_hash = NULL;
 static GDBusConnection *session_bus = NULL;
@@ -54,6 +54,7 @@ static gboolean
 unref_skeleton_in_timeout_cb (gpointer user_data)
 {
   static gboolean unreffed = FALSE;
+
   g_debug ("unreffing portal main ref");
   if (!unreffed)
     {
@@ -98,7 +99,7 @@ G_LOCK_DEFINE_STATIC (idle);
 static void
 schedule_idle_callback (void)
 {
-  G_LOCK(idle);
+  G_LOCK (idle);
 
   if (!no_idle_exit)
     {
@@ -108,11 +109,12 @@ schedule_idle_callback (void)
       idle_timeout_id = g_timeout_add_seconds (IDLE_TIMEOUT_SECS, idle_timeout_cb, NULL);
     }
 
-  G_UNLOCK(idle);
+  G_UNLOCK (idle);
 }
 
-typedef struct {
-  GPid pid;
+typedef struct
+{
+  GPid  pid;
   char *client;
   guint child_watch;
 } PidData;
@@ -130,6 +132,7 @@ child_watch_died (GPid     pid,
                   gpointer user_data)
 {
   PidData *pid_data = user_data;
+
   g_autoptr(GVariant) signal_variant = NULL;
 
   g_debug ("Client Pid %d died", pid_data->pid);
@@ -144,29 +147,31 @@ child_watch_died (GPid     pid,
                                  NULL);
 
   /* This frees the pid_data, so be careful */
-  g_hash_table_remove (client_pid_data_hash, GUINT_TO_POINTER(pid_data->pid));
+  g_hash_table_remove (client_pid_data_hash, GUINT_TO_POINTER (pid_data->pid));
 
   /* This might have caused us to go to idle (zero children) */
   schedule_idle_callback ();
 }
 
-typedef struct {
+typedef struct
+{
   int from;
   int to;
   int final;
 } FdMapEntry;
 
-typedef struct {
+typedef struct
+{
   FdMapEntry *fd_map;
-  int fd_map_len;
-  gboolean set_tty;
-  int tty;
+  int         fd_map_len;
+  gboolean    set_tty;
+  int         tty;
 } ChildSetupData;
 
 static void
 child_setup_func (gpointer user_data)
 {
-  ChildSetupData *data = (ChildSetupData *)user_data;
+  ChildSetupData *data = (ChildSetupData *) user_data;
   FdMapEntry *fd_map = data->fd_map;
   sigset_t set;
   int i;
@@ -177,7 +182,7 @@ child_setup_func (gpointer user_data)
     {
       g_error ("Failed to unblock signals when starting child");
       return;
-  }
+    }
 
   /* Reset the handlers for all signals to their defaults. */
   for (i = 1; i < NSIG; i++)
@@ -241,7 +246,7 @@ is_valid_expose (const char *expose)
 static char *
 filesystem_sandbox_arg (const char *path,
                         const char *sandbox,
-                        gboolean readonly)
+                        gboolean    readonly)
 {
   g_autoptr(GString) s = g_string_new ("--filesystem=");
   const char *p;
@@ -271,15 +276,15 @@ filesystem_sandbox_arg (const char *path,
 }
 
 static gboolean
-handle_spawn (PortalFlatpak *object,
+handle_spawn (PortalFlatpak         *object,
               GDBusMethodInvocation *invocation,
-              GUnixFDList *fd_list,
-              const gchar *arg_cwd_path,
-              const gchar *const *arg_argv,
-              GVariant *arg_fds,
-              GVariant *arg_envs,
-              guint arg_flags,
-              GVariant *arg_options)
+              GUnixFDList           *fd_list,
+              const gchar           *arg_cwd_path,
+              const gchar *const    *arg_argv,
+              GVariant              *arg_fds,
+              GVariant              *arg_envs,
+              guint                  arg_flags,
+              GVariant              *arg_options)
 {
   g_autoptr(GError) error = NULL;
   ChildSetupData child_setup_data = { NULL };
@@ -497,7 +502,7 @@ handle_spawn (PortalFlatpak *object,
 
   /* Inherit launcher network access from launcher, unless
      NO_NETWORK set. */
-  if (shares != NULL && g_strv_contains ((const char * const *)shares, "network") &&
+  if (shares != NULL && g_strv_contains ((const char * const *) shares, "network") &&
       !(arg_flags & FLATPAK_SPAWN_FLAGS_NO_NETWORK))
     g_ptr_array_add (flatpak_argv, g_strdup ("--share=network"));
   else
@@ -555,9 +560,9 @@ handle_spawn (PortalFlatpak *object,
     }
 
   if (!g_spawn_async_with_pipes (arg_cwd_path,
-                                 (char **)flatpak_argv->pdata,
+                                 (char **) flatpak_argv->pdata,
                                  env,
-                                 G_SPAWN_SEARCH_PATH|G_SPAWN_DO_NOT_REAP_CHILD,
+                                 G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
                                  child_setup_func, &child_setup_data,
                                  &pid,
                                  NULL,
@@ -587,7 +592,7 @@ handle_spawn (PortalFlatpak *object,
 
   g_debug ("Client Pid is %d", pid_data->pid);
 
-  g_hash_table_replace (client_pid_data_hash, GUINT_TO_POINTER(pid_data->pid),
+  g_hash_table_replace (client_pid_data_hash, GUINT_TO_POINTER (pid_data->pid),
                         pid_data);
 
   portal_flatpak_complete_spawn (object, invocation, NULL, pid);
@@ -595,17 +600,17 @@ handle_spawn (PortalFlatpak *object,
 }
 
 static gboolean
-handle_spawn_signal (PortalFlatpak *object,
+handle_spawn_signal (PortalFlatpak         *object,
                      GDBusMethodInvocation *invocation,
-                     guint arg_pid,
-                     guint arg_signal,
-                     gboolean arg_to_process_group)
+                     guint                  arg_pid,
+                     guint                  arg_signal,
+                     gboolean               arg_to_process_group)
 {
   PidData *pid_data = NULL;
 
   g_debug ("spawn_signal(%d %d)", arg_pid, arg_signal);
 
-  pid_data = g_hash_table_lookup (client_pid_data_hash, GUINT_TO_POINTER(arg_pid));
+  pid_data = g_hash_table_lookup (client_pid_data_hash, GUINT_TO_POINTER (arg_pid));
   if (pid_data == NULL ||
       strcmp (pid_data->client, g_dbus_method_invocation_get_sender (invocation)) != 0)
     {
@@ -657,7 +662,7 @@ authorize_method_handler (GDBusInterfaceSkeleton *interface,
       return FALSE;
     }
 
-  g_object_set_data_full (G_OBJECT (invocation), "app-info", g_steal_pointer (&keyfile), (GDestroyNotify)g_key_file_unref);
+  g_object_set_data_full (G_OBJECT (invocation), "app-info", g_steal_pointer (&keyfile), (GDestroyNotify) g_key_file_unref);
 
   return TRUE;
 }
@@ -673,7 +678,7 @@ on_bus_acquired (GDBusConnection *connection,
 
   portal = portal_flatpak_skeleton_new ();
 
-  g_object_set_data_full (G_OBJECT(portal), "track-alive", GINT_TO_POINTER(42), skeleton_died_cb);
+  g_object_set_data_full (G_OBJECT (portal), "track-alive", GINT_TO_POINTER (42), skeleton_died_cb);
 
   g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (portal),
                                        G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD);
@@ -712,11 +717,11 @@ on_name_lost (GDBusConnection *connection,
 }
 
 static void
-binary_file_changed_cb (GFileMonitor *file_monitor,
-                        GFile *file,
-                        GFile *other_file,
+binary_file_changed_cb (GFileMonitor     *file_monitor,
+                        GFile            *file,
+                        GFile            *other_file,
                         GFileMonitorEvent event_type,
-                        gpointer data)
+                        gpointer          data)
 {
   static gboolean got_it = FALSE;
 
@@ -747,12 +752,13 @@ int
 main (int    argc,
       char **argv)
 {
-  gchar exe_path[PATH_MAX+1];
+  gchar exe_path[PATH_MAX + 1];
   ssize_t exe_path_len;
   gboolean replace;
   gboolean show_version;
   GOptionContext *context;
   GBusNameOwnerFlags flags;
+
   g_autoptr(GError) error = NULL;
   const GOptionEntry options[] = {
     { "replace", 'r', 0, G_OPTION_ARG_NONE, &replace,  "Replace old daemon.", NULL },
@@ -781,7 +787,7 @@ main (int    argc,
 
   if (!g_option_context_parse (context, &argc, &argv, &error))
     {
-      g_printerr ("%s: %s", g_get_application_name(), error->message);
+      g_printerr ("%s: %s", g_get_application_name (), error->message);
       g_printerr ("\n");
       g_printerr ("Try \"%s --help\" for more information.",
                   g_get_prgname ());
@@ -799,7 +805,7 @@ main (int    argc,
   if (opt_verbose)
     g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, message_handler, NULL);
 
-  client_pid_data_hash = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify)pid_data_free);
+  client_pid_data_hash = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) pid_data_free);
 
   session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
   if (session_bus == NULL)
@@ -835,13 +841,13 @@ main (int    argc,
     flags |= G_BUS_NAME_OWNER_FLAGS_REPLACE;
 
   name_owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
-                             "org.freedesktop.portal.Flatpak",
-                             flags,
-                             on_bus_acquired,
-                             on_name_acquired,
-                             on_name_lost,
-                             NULL,
-                             NULL);
+                                  "org.freedesktop.portal.Flatpak",
+                                  flags,
+                                  on_bus_acquired,
+                                  on_name_acquired,
+                                  on_name_lost,
+                                  NULL,
+                                  NULL);
 
   /* Ensure we don't idle exit */
   schedule_idle_callback ();
diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c
index c659c3ad..562f4735 100644
--- a/session-helper/flatpak-session-helper.c
+++ b/session-helper/flatpak-session-helper.c
@@ -51,8 +51,9 @@ handle_sigterm (int signum)
   _exit (1);
 }
 
-typedef struct {
-  GPid pid;
+typedef struct
+{
+  GPid  pid;
   char *client;
   guint child_watch;
 } PidData;
@@ -65,7 +66,7 @@ pid_data_free (PidData *data)
 }
 
 static gboolean
-handle_request_monitor (FlatpakSessionHelper   *object,
+handle_request_monitor (FlatpakSessionHelper  *object,
                         GDBusMethodInvocation *invocation,
                         gpointer               user_data)
 {
@@ -76,7 +77,7 @@ handle_request_monitor (FlatpakSessionHelper   *object,
 }
 
 static gboolean
-handle_request_session (FlatpakSessionHelper   *object,
+handle_request_session (FlatpakSessionHelper  *object,
                         GDBusMethodInvocation *invocation,
                         gpointer               user_data)
 {
@@ -103,6 +104,7 @@ child_watch_died (GPid     pid,
                   gpointer user_data)
 {
   PidData *pid_data = user_data;
+
   g_autoptr(GVariant) signal_variant = NULL;
 
   g_debug ("Client Pid %d died", pid_data->pid);
@@ -117,26 +119,28 @@ child_watch_died (GPid     pid,
                                  NULL);
 
   /* This frees the pid_data, so be careful */
-  g_hash_table_remove (client_pid_data_hash, GUINT_TO_POINTER(pid_data->pid));
+  g_hash_table_remove (client_pid_data_hash, GUINT_TO_POINTER (pid_data->pid));
 }
 
-typedef struct {
+typedef struct
+{
   int from;
   int to;
   int final;
 } FdMapEntry;
 
-typedef struct {
+typedef struct
+{
   FdMapEntry *fd_map;
-  int fd_map_len;
-  gboolean set_tty;
-  int tty;
+  int         fd_map_len;
+  gboolean    set_tty;
+  int         tty;
 } ChildSetupData;
 
 static void
 child_setup_func (gpointer user_data)
 {
-  ChildSetupData *data = (ChildSetupData *)user_data;
+  ChildSetupData *data = (ChildSetupData *) user_data;
   FdMapEntry *fd_map = data->fd_map;
   sigset_t set;
   int i;
@@ -147,7 +151,7 @@ child_setup_func (gpointer user_data)
     {
       g_error ("Failed to unblock signals when starting child");
       return;
-  }
+    }
 
   /* Reset the handlers for all signals to their defaults. */
   for (i = 1; i < NSIG; i++)
@@ -200,13 +204,13 @@ child_setup_func (gpointer user_data)
 
 
 static gboolean
-handle_host_command (FlatpakDevelopment *object,
+handle_host_command (FlatpakDevelopment    *object,
                      GDBusMethodInvocation *invocation,
-                     const gchar *arg_cwd_path,
-                     const gchar *const *arg_argv,
-                     GVariant *arg_fds,
-                     GVariant *arg_envs,
-                     guint flags)
+                     const gchar           *arg_cwd_path,
+                     const gchar *const    *arg_argv,
+                     GVariant              *arg_fds,
+                     GVariant              *arg_envs,
+                     guint                  flags)
 {
   g_autoptr(GError) error = NULL;
   GDBusMessage *message = g_dbus_method_invocation_get_message (invocation);
@@ -315,9 +319,9 @@ handle_host_command (FlatpakDevelopment *object,
     }
 
   if (!g_spawn_async_with_pipes (arg_cwd_path,
-                                 (char **)arg_argv,
+                                 (char **) arg_argv,
                                  env,
-                                 G_SPAWN_SEARCH_PATH|G_SPAWN_DO_NOT_REAP_CHILD,
+                                 G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
                                  child_setup_func, &child_setup_data,
                                  &pid,
                                  NULL,
@@ -347,7 +351,7 @@ handle_host_command (FlatpakDevelopment *object,
 
   g_debug ("Client Pid is %d", pid_data->pid);
 
-  g_hash_table_replace (client_pid_data_hash, GUINT_TO_POINTER(pid_data->pid),
+  g_hash_table_replace (client_pid_data_hash, GUINT_TO_POINTER (pid_data->pid),
                         pid_data);
 
 
@@ -357,15 +361,15 @@ handle_host_command (FlatpakDevelopment *object,
 }
 
 static gboolean
-handle_host_command_signal (FlatpakDevelopment *object,
+handle_host_command_signal (FlatpakDevelopment    *object,
                             GDBusMethodInvocation *invocation,
-                            guint arg_pid,
-                            guint arg_signal,
-                            gboolean to_process_group)
+                            guint                  arg_pid,
+                            guint                  arg_signal,
+                            gboolean               to_process_group)
 {
   PidData *pid_data = NULL;
 
-  pid_data = g_hash_table_lookup (client_pid_data_hash, GUINT_TO_POINTER(arg_pid));
+  pid_data = g_hash_table_lookup (client_pid_data_hash, GUINT_TO_POINTER (arg_pid));
   if (pid_data == NULL ||
       strcmp (pid_data->client, g_dbus_method_invocation_get_sender (invocation)) != 0)
     {
@@ -449,9 +453,10 @@ on_name_lost (GDBusConnection *connection,
  * which on stateless systems is often a symlink to a dyamically-generated
  * or updated file in /run.
  */
-typedef struct {
-  const gchar *source;
-  char *real;
+typedef struct
+{
+  const gchar  *source;
+  char         *real;
   GFileMonitor *monitor_source;
   GFileMonitor *monitor_real;
 } MonitorData;
@@ -489,17 +494,17 @@ copy_file (const char *source,
   g_free (contents);
 }
 
-static void
-file_changed (GFileMonitor     *monitor,
-              GFile            *file,
-              GFile            *other_file,
-              GFileMonitorEvent event_type,
-              MonitorData      *data);
+static void file_changed (GFileMonitor     *monitor,
+                          GFile            *file,
+                          GFile            *other_file,
+                          GFileMonitorEvent event_type,
+                          MonitorData      *data);
 
 static void
 update_real_monitor (MonitorData *data)
 {
   char *real = realpath (data->source, NULL);
+
   if (real == NULL)
     {
       g_debug ("unable to get real path to monitor host file %s: %s", data->source,
@@ -614,27 +619,27 @@ start_p11_kit_server (const char *flatpak_dir)
   g_autofree char *socket_path = g_build_filename (flatpak_dir, socket_basename, NULL);
   g_autofree char *p11_kit_stdout = NULL;
   gint exit_status;
+
   g_autoptr(GError) local_error = NULL;
   g_auto(GStrv) stdout_lines = NULL;
   int i;
-  char *p11_argv[] =
-    {
-     "p11-kit", "server",
-     /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support
-      * this flag. This is good, because those earlier versions did not properly daemonize and caused
-      * the spawn_sync to hang forever, waiting for the pipe to close.
-      */
-     "--sh",
-     "-n", socket_path,
-     "--provider",  "p11-kit-trust.so",
-     "pkcs11:model=p11-kit-trust?write-protected=yes",
-     NULL
-    };
+  char *p11_argv[] = {
+    "p11-kit", "server",
+    /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support
+     * this flag. This is good, because those earlier versions did not properly daemonize and caused
+     * the spawn_sync to hang forever, waiting for the pipe to close.
+     */
+    "--sh",
+    "-n", socket_path,
+    "--provider",  "p11-kit-trust.so",
+    "pkcs11:model=p11-kit-trust?write-protected=yes",
+    NULL
+  };
 
   g_debug ("starting p11-kit server");
 
   if (!g_spawn_sync (NULL,
-                     p11_argv, NULL, G_SPAWN_SEARCH_PATH|G_SPAWN_STDERR_TO_DEV_NULL,
+                     p11_argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
                      NULL, NULL,
                      &p11_kit_stdout, NULL,
                      &exit_status, &local_error))
@@ -653,7 +658,7 @@ start_p11_kit_server (const char *flatpak_dir)
   /* Output is something like:
      P11_KIT_SERVER_ADDRESS=unix:path=/run/user/1000/p11-kit/pkcs11-2603742; export P11_KIT_SERVER_ADDRESS;
      P11_KIT_SERVER_PID=2603743; export P11_KIT_SERVER_PID;
-  */
+   */
   for (i = 0; stdout_lines[i] != NULL; i++)
     {
       char *line = stdout_lines[i];
@@ -672,11 +677,11 @@ start_p11_kit_server (const char *flatpak_dir)
 
   if (p11_kit_server_pid != 0)
     {
-      g_debug  ("Using p11-kit socket path %s, pid %d", socket_path, p11_kit_server_pid);
+      g_debug ("Using p11-kit socket path %s, pid %d", socket_path, p11_kit_server_pid);
       p11_kit_server_socket_path = g_steal_pointer (&socket_path);
     }
   else
-      g_debug  ("Not using p11-kit due to older version");
+    g_debug ("Not using p11-kit due to older version");
 }
 
 int
@@ -691,6 +696,7 @@ main (int    argc,
   GOptionContext *context;
   GBusNameOwnerFlags flags;
   g_autofree char *flatpak_dir = NULL;
+
   g_autoptr(GError) error = NULL;
   const GOptionEntry options[] = {
     { "replace", 'r', 0, G_OPTION_ARG_NONE, &replace,  "Replace old daemon.", NULL },
@@ -703,11 +709,11 @@ main (int    argc,
 
   atexit (do_atexit);
 
-  memset(&action, 0, sizeof(struct sigaction));
+  memset (&action, 0, sizeof (struct sigaction));
   action.sa_handler = handle_sigterm;
-  sigaction(SIGTERM, &action, NULL);
-  sigaction(SIGHUP, &action, NULL);
-  sigaction(SIGINT, &action, NULL);
+  sigaction (SIGTERM, &action, NULL);
+  sigaction (SIGHUP, &action, NULL);
+  sigaction (SIGINT, &action, NULL);
 
   setlocale (LC_ALL, "");
 
@@ -728,7 +734,7 @@ main (int    argc,
 
   if (!g_option_context_parse (context, &argc, &argv, &error))
     {
-      g_printerr ("%s: %s", g_get_application_name(), error->message);
+      g_printerr ("%s: %s", g_get_application_name (), error->message);
       g_printerr ("\n");
       g_printerr ("Try \"%s --help\" for more information.",
                   g_get_prgname ());
@@ -748,7 +754,7 @@ main (int    argc,
 
   flatpak_migrate_from_xdg_app ();
 
-  client_pid_data_hash = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify)pid_data_free);
+  client_pid_data_hash = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) pid_data_free);
 
   session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
   if (session_bus == NULL)
@@ -764,7 +770,7 @@ main (int    argc,
       exit (1);
     }
 
-  if (g_find_program_in_path  ("p11-kit"))
+  if (g_find_program_in_path ("p11-kit"))
     start_p11_kit_server (flatpak_dir);
   else
     g_debug ("p11-kit not found");
diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c
index 78daffff..517b7287 100644
--- a/system-helper/flatpak-system-helper.c
+++ b/system-helper/flatpak-system-helper.c
@@ -39,13 +39,13 @@ static guint name_owner_id = 0;
 static gboolean on_session_bus = FALSE;
 static gboolean no_idle_exit = FALSE;
 
-#define IDLE_TIMEOUT_SECS 10*60
+#define IDLE_TIMEOUT_SECS 10 * 60
 
 /* This uses a weird Auto prefix to avoid conflicts with later added polkit types.
  */
 typedef PolkitAuthorizationResult AutoPolkitAuthorizationResult;
-typedef PolkitDetails AutoPolkitDetails;
-typedef PolkitSubject AutoPolkitSubject;
+typedef PolkitDetails             AutoPolkitDetails;
+typedef PolkitSubject             AutoPolkitSubject;
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoPolkitAuthorizationResult, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoPolkitDetails, g_object_unref)
@@ -62,6 +62,7 @@ static gboolean
 unref_skeleton_in_timeout_cb (gpointer user_data)
 {
   static gboolean unreffed = FALSE;
+
   g_debug ("unreffing helper main ref");
   if (!unreffed)
     {
@@ -104,7 +105,7 @@ schedule_idle_callback (void)
 {
   static guint idle_timeout_id = 0;
 
-  G_LOCK(idle);
+  G_LOCK (idle);
 
   if (!no_idle_exit)
     {
@@ -114,7 +115,7 @@ schedule_idle_callback (void)
       idle_timeout_id = g_timeout_add_seconds (IDLE_TIMEOUT_SECS, idle_timeout_cb, NULL);
     }
 
-  G_UNLOCK(idle);
+  G_UNLOCK (idle);
 }
 
 static FlatpakDir *
@@ -250,11 +251,11 @@ handle_deploy (FlatpakSystemHelper   *object,
                                   NULL);
 
       if (upstream_url == NULL)
-	{
-	  g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
-						 "Remote %s is disabled", arg_origin);
-	  return TRUE;
-	}
+        {
+          g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED,
+                                                 "Remote %s is disabled", arg_origin);
+          return TRUE;
+        }
 
       registry = flatpak_oci_registry_new (registry_uri, FALSE, -1, NULL, &error);
       if (registry == NULL)
@@ -291,14 +292,14 @@ handle_deploy (FlatpakSystemHelper   *object,
 
       soup_session = flatpak_create_soup_session (PACKAGE_STRING);
       if (!flatpak_oci_index_verify_ref (soup_session,
-					 upstream_url,
-					 arg_ref,
-					 desc->parent.digest,
-					 NULL, &error))
-	{
-	  g_dbus_method_invocation_return_gerror (invocation, error);
-	  return TRUE;
-	}
+                                         upstream_url,
+                                         arg_ref,
+                                         desc->parent.digest,
+                                         NULL, &error))
+        {
+          g_dbus_method_invocation_return_gerror (invocation, error);
+          return TRUE;
+        }
 
       checksum = flatpak_pull_from_oci (flatpak_dir_get_repo (system), registry, NULL, desc->parent.digest, FLATPAK_OCI_MANIFEST (versioned),
                                         arg_origin, arg_ref, NULL, NULL, NULL, &error);
@@ -368,7 +369,7 @@ handle_deploy (FlatpakSystemHelper   *object,
 
       ostree_progress = ostree_async_progress_new_and_connect (no_progress_cb, NULL);
 
-      if (!flatpak_dir_pull (system, state, arg_ref, NULL, NULL, (const char **)arg_subpaths, NULL,
+      if (!flatpak_dir_pull (system, state, arg_ref, NULL, NULL, (const char **) arg_subpaths, NULL,
                              FLATPAK_PULL_FLAGS_NONE, OSTREE_REPO_PULL_FLAGS_UNTRUSTED, ostree_progress,
                              NULL, &error))
         {
@@ -386,7 +387,7 @@ handle_deploy (FlatpakSystemHelper   *object,
       if (is_update)
         {
           if (!flatpak_dir_deploy_update (system, arg_ref,
-                                          NULL, (const char **)arg_subpaths, NULL, &error))
+                                          NULL, (const char **) arg_subpaths, NULL, &error))
             {
               if (g_error_matches (error, FLATPAK_ERROR, FLATPAK_ERROR_ALREADY_INSTALLED))
                 g_dbus_method_invocation_return_error (invocation, FLATPAK_ERROR, FLATPAK_ERROR_ALREADY_INSTALLED,
@@ -621,11 +622,11 @@ handle_deploy_appstream (FlatpakSystemHelper   *object,
 }
 
 static gboolean
-handle_uninstall (FlatpakSystemHelper *object,
+handle_uninstall (FlatpakSystemHelper   *object,
                   GDBusMethodInvocation *invocation,
-                  guint arg_flags,
-                  const gchar *arg_ref,
-                  const gchar *arg_installation)
+                  guint                  arg_flags,
+                  const gchar           *arg_ref,
+                  const gchar           *arg_installation)
 {
   g_autoptr(FlatpakDir) system = NULL;
   g_autoptr(GError) error = NULL;
@@ -712,13 +713,13 @@ handle_install_bundle (FlatpakSystemHelper   *object,
 
 
 static gboolean
-handle_configure_remote (FlatpakSystemHelper *object,
+handle_configure_remote (FlatpakSystemHelper   *object,
                          GDBusMethodInvocation *invocation,
-                         guint arg_flags,
-                         const gchar *arg_remote,
-                         const gchar *arg_config,
-                         GVariant *arg_gpg_key,
-                         const gchar *arg_installation)
+                         guint                  arg_flags,
+                         const gchar           *arg_remote,
+                         const gchar           *arg_config,
+                         GVariant              *arg_gpg_key,
+                         const gchar           *arg_installation)
 {
   g_autoptr(FlatpakDir) system = NULL;
   g_autoptr(GError) error = NULL;
@@ -798,12 +799,12 @@ handle_configure_remote (FlatpakSystemHelper *object,
 }
 
 static gboolean
-handle_configure (FlatpakSystemHelper *object,
-		  GDBusMethodInvocation *invocation,
-		  guint arg_flags,
-		  const gchar *arg_key,
-		  const gchar *arg_value,
-		  const gchar *arg_installation)
+handle_configure (FlatpakSystemHelper   *object,
+                  GDBusMethodInvocation *invocation,
+                  guint                  arg_flags,
+                  const gchar           *arg_key,
+                  const gchar           *arg_value,
+                  const gchar           *arg_installation)
 {
   g_autoptr(FlatpakDir) system = NULL;
   g_autoptr(GError) error = NULL;
@@ -853,13 +854,13 @@ handle_configure (FlatpakSystemHelper *object,
 }
 
 static gboolean
-handle_update_remote (FlatpakSystemHelper *object,
+handle_update_remote (FlatpakSystemHelper   *object,
                       GDBusMethodInvocation *invocation,
-                      guint arg_flags,
-                      const gchar *arg_remote,
-                      const gchar *arg_installation,
-                      const gchar *arg_summary_path,
-                      const gchar *arg_summary_sig_path)
+                      guint                  arg_flags,
+                      const gchar           *arg_remote,
+                      const gchar           *arg_installation,
+                      const gchar           *arg_summary_path,
+                      const gchar           *arg_summary_sig_path)
 {
   g_autoptr(FlatpakDir) system = NULL;
   g_autoptr(GError) error = NULL;
@@ -1084,6 +1085,7 @@ flatpak_authorize_method_handler (GDBusInterfaceSkeleton *interface,
   const gchar *method_name = g_dbus_method_invocation_get_method_name (invocation);
   const gchar *sender = g_dbus_method_invocation_get_sender (invocation);
   GVariant *parameters = g_dbus_method_invocation_get_parameters (invocation);
+
   g_autoptr(AutoPolkitSubject) subject = polkit_system_bus_name_new (sender);
   g_autoptr(AutoPolkitDetails) details = polkit_details_new ();
   const gchar *action = NULL;
@@ -1256,7 +1258,7 @@ on_bus_acquired (GDBusConnection *connection,
 
   flatpak_system_helper_set_version (FLATPAK_SYSTEM_HELPER (helper), 1);
 
-  g_object_set_data_full (G_OBJECT(helper), "track-alive", GINT_TO_POINTER(42), skeleton_died_cb);
+  g_object_set_data_full (G_OBJECT (helper), "track-alive", GINT_TO_POINTER (42), skeleton_died_cb);
 
   g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (helper),
                                        G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD);
@@ -1305,11 +1307,11 @@ on_name_lost (GDBusConnection *connection,
 }
 
 static void
-binary_file_changed_cb (GFileMonitor *file_monitor,
-                        GFile *file,
-                        GFile *other_file,
+binary_file_changed_cb (GFileMonitor     *file_monitor,
+                        GFile            *file,
+                        GFile            *other_file,
                         GFileMonitorEvent event_type,
-                        gpointer data)
+                        gpointer          data)
 {
   static gboolean got_it = FALSE;
 
@@ -1339,13 +1341,14 @@ int
 main (int    argc,
       char **argv)
 {
-  gchar exe_path[PATH_MAX+1];
+  gchar exe_path[PATH_MAX + 1];
   ssize_t exe_path_len;
   gboolean replace;
   gboolean verbose;
   gboolean show_version;
   GBusNameOwnerFlags flags;
   GOptionContext *context;
+
   g_autoptr(GError) error = NULL;
   const GOptionEntry options[] = {
     { "replace", 'r', 0, G_OPTION_ARG_NONE, &replace,  "Replace old daemon.", NULL },
@@ -1375,7 +1378,7 @@ main (int    argc,
 
   if (!g_option_context_parse (context, &argc, &argv, &error))
     {
-      g_printerr ("%s: %s", g_get_application_name(), error->message);
+      g_printerr ("%s: %s", g_get_application_name (), error->message);
       g_printerr ("\n");
       g_printerr ("Try \"%s --help\" for more information.",
                   g_get_prgname ());
diff --git a/tests/testlibrary.c b/tests/testlibrary.c
index fe97303a..42b6e4ec 100644
--- a/tests/testlibrary.c
+++ b/tests/testlibrary.c
@@ -25,20 +25,20 @@ int httpd_pid = -1;
 static const char *gpg_id = "7B0961FD";
 const char *repo_name = "test-repo";
 
-typedef enum
-{
+typedef enum {
   RUN_TEST_SUBPROCESS_DEFAULT = 0,
   RUN_TEST_SUBPROCESS_IGNORE_FAILURE = (1 << 0),
   RUN_TEST_SUBPROCESS_NO_CAPTURE = (1 << 1),
 } RunTestSubprocessFlags;
 
-static void run_test_subprocess (char **argv, RunTestSubprocessFlags flags);
+static void run_test_subprocess (char                 **argv,
+                                 RunTestSubprocessFlags flags);
 
 typedef struct
 {
-  const char *id;
-  const char *display_name;
-  gint        priority;
+  const char        *id;
+  const char        *display_name;
+  gint               priority;
   FlatpakStorageType storage_type;
 } InstallationExtraData;
 
@@ -47,7 +47,7 @@ test_library_version (void)
 {
   g_autofree char *version = NULL;
 
-  version = g_strdup_printf ("%d.%d.%d" G_STRINGIFY(PACKAGE_EXTRA_VERSION),
+  version = g_strdup_printf ("%d.%d.%d" G_STRINGIFY (PACKAGE_EXTRA_VERSION),
                              FLATPAK_MAJOR_VERSION,
                              FLATPAK_MINOR_VERSION,
                              FLATPAK_MICRO_VERSION);
@@ -122,11 +122,11 @@ test_multiple_system_installations (void)
 
   for (i = 0; i < system_dirs->len; i++)
     {
-      g_autoptr (FlatpakInstallation) new_install = NULL;
+      g_autoptr(FlatpakInstallation) new_install = NULL;
       g_autoptr(GFile) installation_path = NULL;
       g_autofree char *path_str = NULL;
 
-      installation = (FlatpakInstallation*) g_ptr_array_index (system_dirs, i);
+      installation = (FlatpakInstallation *) g_ptr_array_index (system_dirs, i);
       g_assert_false (flatpak_installation_get_is_user (installation));
 
       installation_path = flatpak_installation_get_path (installation);
@@ -155,10 +155,10 @@ test_multiple_system_installations (void)
       new_install = flatpak_installation_new_system_with_id (current_id, NULL, &error);
       g_assert_nonnull (new_install);
 
-      g_assert_cmpstr(current_id, ==, flatpak_installation_get_id (new_install));
-      g_assert_cmpstr(current_display_name, ==, flatpak_installation_get_display_name (new_install));
-      g_assert_cmpint(current_priority, ==, flatpak_installation_get_priority (new_install));
-      g_assert_cmpint(current_storage_type, ==, flatpak_installation_get_storage_type (new_install));
+      g_assert_cmpstr (current_id, ==, flatpak_installation_get_id (new_install));
+      g_assert_cmpstr (current_display_name, ==, flatpak_installation_get_display_name (new_install));
+      g_assert_cmpint (current_priority, ==, flatpak_installation_get_priority (new_install));
+      g_assert_cmpint (current_storage_type, ==, flatpak_installation_get_storage_type (new_install));
     }
 }
 
@@ -405,6 +405,7 @@ test_list_refs_in_remotes (void)
 {
   const char *repo_name = "multi-refs-repo";
   g_autofree char *repo_url = NULL;
+
   g_autoptr(GPtrArray) refs1 = NULL;
   g_autoptr(GPtrArray) refs2 = NULL;
   g_autoptr(FlatpakInstallation) inst = NULL;
@@ -523,30 +524,32 @@ test_list_remote_refs (void)
       g_assert (metadata != NULL);
 
       if (strcmp ("org.test.Hello", flatpak_ref_get_name (ref)) == 0)
-        g_assert (g_str_has_prefix ((char *)g_bytes_get_data (metadata, NULL), "[Application]"));
+        g_assert (g_str_has_prefix ((char *) g_bytes_get_data (metadata, NULL), "[Application]"));
       else
-        g_assert (g_str_has_prefix ((char *)g_bytes_get_data (metadata, NULL), "[Runtime]"));
+        g_assert (g_str_has_prefix ((char *) g_bytes_get_data (metadata, NULL), "[Runtime]"));
     }
 }
 
 static void
 progress_cb (const char *status,
-             guint progress,
-             gboolean estimating,
-             gpointer user_data)
+             guint       progress,
+             gboolean    estimating,
+             gpointer    user_data)
 {
   int *count = user_data;
+
   *count += 1;
 }
 
 static void
-changed_cb (GFileMonitor *monitor,
-            GFile *file,
-            GFile *other_file,
+changed_cb (GFileMonitor     *monitor,
+            GFile            *file,
+            GFile            *other_file,
             GFileMonitorEvent event_type,
-            gpointer user_data)
+            gpointer          user_data)
 {
   int *count = user_data;
+
   *count += 1;
 }
 
@@ -554,6 +557,7 @@ static gboolean
 timeout_cb (gpointer data)
 {
   gboolean *timeout_reached = data;
+
   *timeout_reached = TRUE;
   return G_SOURCE_CONTINUE;
 }
@@ -579,8 +583,8 @@ test_install_launch_uninstall (void)
   if (bwrap != NULL)
     {
       gint exit_code = 0;
-      char *argv[] = { (char *)bwrap, "--unshare-ipc", "--unshare-net",
-          "--unshare-pid", "--ro-bind", "/", "/", "/bin/true", NULL };
+      char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net",
+                       "--unshare-pid", "--ro-bind", "/", "/", "/bin/true", NULL };
       g_autofree char *argv_str = g_strjoinv (" ", argv);
       g_test_message ("Spawning %s", argv_str);
       g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error);
@@ -836,10 +840,11 @@ test_list_updates (void)
 }
 
 static void
-run_test_subprocess (char **argv,
+run_test_subprocess (char                 **argv,
                      RunTestSubprocessFlags flags)
 {
   int status;
+
   g_autoptr(GError) error = NULL;
   g_autofree char *argv_str = g_strjoinv (" ", argv);
   g_autofree char *output = NULL;
@@ -929,6 +934,7 @@ static void
 update_repo (void)
 {
   char *argv[] = { "flatpak", "build-update-repo", "--gpg-homedir=", "--gpg-sign=", "repos/test", NULL };
+
   g_auto(GStrv) gpgargs = NULL;
 
   gpgargs = g_strsplit (gpg_args, " ", 0);
@@ -941,7 +947,7 @@ static void
 launch_httpd (void)
 {
   g_autofree char *path = g_test_build_filename (G_TEST_DIST, "test-webserver.sh", NULL);
-  char *argv[] = {path , "repos", NULL };
+  char *argv[] = {path, "repos", NULL };
 
   /* The web server puts itself in the background, so we can't wait
    * for EOF on its stdout, stderr */
@@ -978,7 +984,7 @@ add_remote (void)
 
   argv[3] = gpgimport;
   argv[4] = collection_id_arg;
-  argv[5] = (char *)repo_name;
+  argv[5] = (char *) repo_name;
   argv[6] = repo_url;
   run_test_subprocess (argv, RUN_TEST_SUBPROCESS_DEFAULT);
 }
@@ -992,18 +998,19 @@ add_extra_installation (const char *id,
   g_autofree char *conffile_path = NULL;
   g_autofree char *contents_string = NULL;
   g_autofree char *path = NULL;
+
   g_autoptr(GPtrArray) contents_array = NULL;
   g_autoptr(GError) error = NULL;
 
   path = g_strconcat (testdir, "/system-", id, NULL);
-  g_mkdir_with_parents (path, S_IRWXU|S_IRWXG|S_IRWXO);
+  g_mkdir_with_parents (path, S_IRWXU | S_IRWXG | S_IRWXO);
 
-  contents_array = g_ptr_array_new_with_free_func ((GDestroyNotify)g_free);
+  contents_array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_free);
 
   g_ptr_array_add (contents_array,
-      g_strdup_printf ("[Installation \"%s\"]\n"
-                       "Path=%s",
-                       id, path));
+                   g_strdup_printf ("[Installation \"%s\"]\n"
+                                    "Path=%s",
+                                    id, path));
 
   if (display_name != NULL)
     g_ptr_array_add (contents_array, g_strdup_printf ("DisplayName=%s", display_name));
@@ -1015,7 +1022,7 @@ add_extra_installation (const char *id,
     g_ptr_array_add (contents_array, g_strdup_printf ("Priority=%s", priority));
 
   g_ptr_array_add (contents_array, NULL);
-  contents_string = g_strjoinv ("\n", (char**)contents_array->pdata);
+  contents_string = g_strjoinv ("\n", (char **) contents_array->pdata);
 
   conffile_path = g_strconcat (flatpak_installationsdir, "/", id, ".conf", NULL);
   g_file_set_contents (conffile_path, contents_string, -1, &error);
@@ -1026,7 +1033,7 @@ static void
 setup_multiple_installations (void)
 {
   flatpak_installationsdir = g_strconcat (flatpak_configdir, "/installations.d", NULL);
-  g_mkdir_with_parents (flatpak_installationsdir, S_IRWXU|S_IRWXG|S_IRWXO);
+  g_mkdir_with_parents (flatpak_installationsdir, S_IRWXU | S_IRWXG | S_IRWXO);
 
   add_extra_installation ("extra-installation-1", "Extra system installation 1", "mmc", "10");
   add_extra_installation ("extra-installation-2", "Extra system installation 2", "sdcard", "25");
@@ -1049,6 +1056,7 @@ copy_file (const char *src, const char *dest)
 {
   gchar *buffer = NULL;
   gsize length;
+
   g_autoptr(GError) error = NULL;
 
   g_test_message ("copying %s to %s", src, dest);
@@ -1091,54 +1099,54 @@ global_setup (void)
   g_test_message ("testdir: %s", testdir);
 
   homedir = g_strconcat (testdir, "/home", NULL);
-  g_mkdir_with_parents (homedir, S_IRWXU|S_IRWXG|S_IRWXO);
+  g_mkdir_with_parents (homedir, S_IRWXU | S_IRWXG | S_IRWXO);
 
   g_setenv ("HOME", homedir, TRUE);
   g_test_message ("setting HOME=%s", homedir);
 
   cachedir = g_strconcat (testdir, "/home/cache", NULL);
-  g_mkdir_with_parents (cachedir, S_IRWXU|S_IRWXG|S_IRWXO);
+  g_mkdir_with_parents (cachedir, S_IRWXU | S_IRWXG | S_IRWXO);
   g_setenv ("XDG_CACHE_HOME", cachedir, TRUE);
   g_test_message ("setting XDG_CACHE_HOME=%s", cachedir);
 
   configdir = g_strconcat (testdir, "/home/config", NULL);
-  g_mkdir_with_parents (configdir, S_IRWXU|S_IRWXG|S_IRWXO);
+  g_mkdir_with_parents (configdir, S_IRWXU | S_IRWXG | S_IRWXO);
   g_setenv ("XDG_CONFIG_HOME", configdir, TRUE);
   g_test_message ("setting XDG_CONFIG_HOME=%s", configdir);
 
   datadir = g_strconcat (testdir, "/home/share", NULL);
-  g_mkdir_with_parents (datadir, S_IRWXU|S_IRWXG|S_IRWXO);
+  g_mkdir_with_parents (datadir, S_IRWXU | S_IRWXG | S_IRWXO);
   g_setenv ("XDG_DATA_HOME", datadir, TRUE);
   g_test_message ("setting XDG_DATA_HOME=%s", datadir);
 
   flatpak_runtimedir = g_strconcat (testdir, "/runtime", NULL);
-  g_mkdir_with_parents (flatpak_runtimedir, S_IRWXU|S_IRWXG|S_IRWXO);
+  g_mkdir_with_parents (flatpak_runtimedir, S_IRWXU | S_IRWXG | S_IRWXO);
   g_test_message ("setting XDG_RUNTIME_DIR=%s", flatpak_runtimedir);
 
   flatpak_systemdir = g_strconcat (testdir, "/system", NULL);
-  g_mkdir_with_parents (flatpak_systemdir, S_IRWXU|S_IRWXG|S_IRWXO);
+  g_mkdir_with_parents (flatpak_systemdir, S_IRWXU | S_IRWXG | S_IRWXO);
   g_setenv ("FLATPAK_SYSTEM_DIR", flatpak_systemdir, TRUE);
   g_test_message ("setting FLATPAK_SYSTEM_DIR=%s", flatpak_systemdir);
 
   flatpak_systemcachedir = g_strconcat (testdir, "/system-cache", NULL);
-  g_mkdir_with_parents (flatpak_systemcachedir, S_IRWXU|S_IRWXG|S_IRWXO);
+  g_mkdir_with_parents (flatpak_systemcachedir, S_IRWXU | S_IRWXG | S_IRWXO);
   g_setenv ("FLATPAK_SYSTEM_CACHE_DIR", flatpak_systemcachedir, TRUE);
   g_test_message ("setting FLATPAK_SYSTEM_CACHE_DIR=%s", flatpak_systemcachedir);
 
   flatpak_configdir = g_strconcat (testdir, "/config", NULL);
-  g_mkdir_with_parents (flatpak_configdir, S_IRWXU|S_IRWXG|S_IRWXO);
+  g_mkdir_with_parents (flatpak_configdir, S_IRWXU | S_IRWXG | S_IRWXO);
   g_setenv ("FLATPAK_CONFIG_DIR", flatpak_configdir, TRUE);
   g_test_message ("setting FLATPAK_CONFIG_DIR=%s", flatpak_configdir);
 
   gpg_homedir = g_strconcat (testdir, "/gpghome", NULL);
-  g_mkdir_with_parents (gpg_homedir, S_IRWXU|S_IRWXG|S_IRWXO);
+  g_mkdir_with_parents (gpg_homedir, S_IRWXU | S_IRWXG | S_IRWXO);
 
   gpg_args = g_strdup_printf ("--gpg-homedir=%s --gpg-sign=%s", gpg_homedir, gpg_id);
   g_setenv ("GPGARGS", gpg_args, TRUE);
   g_test_message ("setting GPGARGS=%s", gpg_args);
 
   copy_gpg ();
-  setup_multiple_installations();
+  setup_multiple_installations ();
   setup_repo ();
 }