diff --git a/src/api/pdc_client_connect.c b/src/api/pdc_client_connect.c
index 437096efd..ad7347a81 100644
--- a/src/api/pdc_client_connect.c
+++ b/src/api/pdc_client_connect.c
@@ -7060,11 +7060,11 @@ metadata_get_kvtag_rpc_cb(const struct hg_cb_info *callback_info)
         PGOTO_ERROR(ret_value, "==PDC_CLIENT[%d]: metadata_add_tag_rpc_cb error with HG_Get_output",
                     pdc_client_mpi_rank_g);
     }
-    client_lookup_args->ret          = output.ret;
+    client_lookup_args->ret = output.ret;
     if (output.kvtag.name)
-        client_lookup_args->kvtag->name  = strdup(output.kvtag.name);
-    client_lookup_args->kvtag->size  = output.kvtag.size;
-    client_lookup_args->kvtag->type  = output.kvtag.type;
+        client_lookup_args->kvtag->name = strdup(output.kvtag.name);
+    client_lookup_args->kvtag->size = output.kvtag.size;
+    client_lookup_args->kvtag->type = output.kvtag.type;
     if (output.kvtag.size > 0) {
         client_lookup_args->kvtag->value = malloc(output.kvtag.size);
         memcpy(client_lookup_args->kvtag->value, output.kvtag.value, output.kvtag.size);
@@ -7444,13 +7444,13 @@ PDCtag_delete(pdcid_t obj_id, char *tag_name, int is_cont)
               &metadata_del_kvtag_handle);
 
     // Fill input structure
-    in.obj_id     = meta_id;
+    in.obj_id = meta_id;
 
     if (is_cont)
         in.hash_value = PDC_get_hash_by_name(cont_prop->cont_info_pub->name);
     else
         in.hash_value = PDC_get_hash_by_name(obj_prop->obj_info_pub->name);
-    in.key        = tag_name;
+    in.key = tag_name;
 
     hg_ret = HG_Forward(metadata_del_kvtag_handle, metadata_add_tag_rpc_cb /*reuse*/, &lookup_args, &in);
     if (hg_ret != HG_SUCCESS)
@@ -7470,7 +7470,6 @@ PDCtag_delete(pdcid_t obj_id, char *tag_name, int is_cont)
     FUNC_LEAVE(ret_value);
 }
 
-
 /* - -------------------------------- */
 /* New Simple Object Access Interface */
 /* - -------------------------------- */
diff --git a/src/server/pdc_server_metadata.c b/src/server/pdc_server_metadata.c
index 91818a941..44b360735 100644
--- a/src/server/pdc_server_metadata.c
+++ b/src/server/pdc_server_metadata.c
@@ -2778,7 +2778,7 @@ PDC_Server_del_kvtag(metadata_get_kvtag_in_t *in, metadata_add_tag_out_t *out)
 #ifdef ENABLE_MULTITHREAD
     int unlocked;
 #endif
-    pdc_hash_table_entry_head *lookup_value;
+    pdc_hash_table_entry_head *  lookup_value;
     pdc_cont_hash_table_entry_t *cont_lookup_value;
 
     FUNC_ENTER(NULL);