diff --git a/libretro-db/Makefile b/libretro-db/Makefile
index 75e9de48e9..b81797d92f 100644
--- a/libretro-db/Makefile
+++ b/libretro-db/Makefile
@@ -12,12 +12,12 @@ endif
 
 LUA_CONVERTER_C = \
 			 rmsgpack.c \
-		    rmsgpack_dom.c \
-		    lua_common.c \
-		    libretrodb.c \
-		    bintree.c \
-		    query.c \
-		    lua_converter.c \
+			 rmsgpack_dom.c \
+			 lua_common.c \
+			 libretrodb.c \
+			 bintree.c \
+			 query.c \
+			 lua_converter.c \
 			 $(LIBRETRO_COMMON_DIR)/compat/compat_fnmatch.c \
 			 $(LIBRETRO_COMMON_DIR)/file/retro_file.c \
 			 $(LIBRETRO_COMMON_DIR)/compat/compat_strl.c
@@ -28,10 +28,10 @@ PLAIN_CONVERTER_C = \
 			 lexer.c \
 			 parser.c \
 			 rmsgpack.c \
-		    rmsgpack_dom.c \
-		    libretrodb.c \
-		    bintree.c \
-		    query.c \
+			 rmsgpack_dom.c \
+			 libretrodb.c \
+			 bintree.c \
+			 query.c \
 			 plain_converter.c \
 			 $(LIBRETRO_COMMON_DIR)/hash/rhash.c \
 			 $(LIBRETRO_COMMON_DIR)/compat/compat_fnmatch.c \
@@ -42,10 +42,10 @@ PLAIN_CONVERTER_OBJS := $(PLAIN_CONVERTER_C:.c=.o)
 
 C_CONVERTER_C = \
 			 rmsgpack.c \
-		    rmsgpack_dom.c \
-		    libretrodb.c \
-		    bintree.c \
-		    query.c \
+			 rmsgpack_dom.c \
+			 libretrodb.c \
+			 bintree.c \
+			 query.c \
 			 c_converter.c \
 			 $(LIBRETRO_COMMON_DIR)/hash/rhash.c \
 			 $(LIBRETRO_COMMON_DIR)/compat/compat_fnmatch.c \
@@ -55,28 +55,28 @@ C_CONVERTER_C = \
 C_CONVERTER_OBJS := $(C_CONVERTER_C:.c=.o)
 
 RARCHDB_TOOL_C = \
-			rmsgpack.c \
-		   rmsgpack_dom.c \
-		   libretrodb_tool.c \
-		   bintree.c \
-		   query.c \
-		   libretrodb.c \
-		   $(LIBRETRO_COMMON_DIR)/compat/compat_fnmatch.c \
-			$(LIBRETRO_COMMON_DIR)/file/retro_file.c \
-			$(LIBRETRO_COMMON_DIR)/compat/compat_strl.c
+			 rmsgpack.c \
+			 rmsgpack_dom.c \
+			 libretrodb_tool.c \
+			 bintree.c \
+			 query.c \
+			 libretrodb.c \
+			 $(LIBRETRO_COMMON_DIR)/compat/compat_fnmatch.c \
+			 $(LIBRETRO_COMMON_DIR)/file/retro_file.c \
+			 $(LIBRETRO_COMMON_DIR)/compat/compat_strl.c
 
 RARCHDB_TOOL_OBJS := $(RARCHDB_TOOL_C:.c=.o)
 
 TESTLIB_C = \
-			testlib.c \
-	      query.c \
-	      libretrodb.c \
-	      bintree.c \
-	      rmsgpack.c \
-	      rmsgpack_dom.c \
-		   $(LIBRETRO_COMMON_DIR)/compat/compat_fnmatch.c \
-			$(LIBRETRO_COMMON_DIR)/file/retro_file.c \
-			$(LIBRETRO_COMMON_DIR)/compat/compat_strl.c
+			 testlib.c \
+			 query.c \
+			 libretrodb.c \
+			 bintree.c \
+			 rmsgpack.c \
+			 rmsgpack_dom.c \
+			 $(LIBRETRO_COMMON_DIR)/compat/compat_fnmatch.c \
+			 $(LIBRETRO_COMMON_DIR)/file/retro_file.c \
+			 $(LIBRETRO_COMMON_DIR)/compat/compat_strl.c
 
 TESTLIB_OBJS := $(TESTLIB_C:.c=.o)
 
diff --git a/libretro-db/lua_common.c b/libretro-db/lua_common.c
index 1422e68813..d7e87bee75 100644
--- a/libretro-db/lua_common.c
+++ b/libretro-db/lua_common.c
@@ -95,59 +95,59 @@ set_nil:
       lua_pop(L, 1);
    }
 #if 1
-      /* re-order to avoid random output each run */
-      struct rmsgpack_dom_pair* ordered_pairs = calloc(out->val.map.len, sizeof(struct rmsgpack_dom_pair));
-      struct rmsgpack_dom_pair* ordered_pairs_outp = ordered_pairs;
-      const char* ordered_keys[] =
+   /* re-order to avoid random output each run */
+   struct rmsgpack_dom_pair* ordered_pairs = calloc(out->val.map.len, sizeof(struct rmsgpack_dom_pair));
+   struct rmsgpack_dom_pair* ordered_pairs_outp = ordered_pairs;
+   const char* ordered_keys[] =
+   {
+      "name",
+      "description",
+      "rom_name",
+      "size",
+      "users",
+      "releasemonth",
+      "releaseyear",
+      "rumble",
+      "analog",
+
+      "famitsu_rating",
+      "edge_rating",
+      "edge_issue",
+      "edge_review",
+
+      "enhancement_hw",
+      "barcode",
+      "esrb_rating",
+      "elspa_rating",
+      "pegi_rating",
+      "cero_rating",
+      "franchise",
+
+      "developer",
+      "publisher",
+      "origin",
+
+      "crc",
+      "md5",
+      "sha1",
+      "serial"
+   };
+   for(i = 0; i < (sizeof(ordered_keys)/sizeof(char*)); i++)
+   {
+      int j;
+      for(j = 0; j < out->val.map.len; j++)
       {
-         "name",
-         "description",
-         "rom_name",
-         "size",
-         "users",
-         "releasemonth",
-         "releaseyear",
-         "rumble",
-         "analog",
-
-         "famitsu_rating",
-         "edge_rating",
-         "edge_issue",
-         "edge_review",
-
-         "enhancement_hw",
-         "barcode",
-         "esrb_rating",
-         "elspa_rating",
-         "pegi_rating",
-         "cero_rating",
-         "franchise",
-
-         "developer",
-         "publisher",
-         "origin",
-
-         "crc",
-         "md5",
-         "sha1",
-         "serial"
-      };
-      for(i = 0; i < (sizeof(ordered_keys)/sizeof(char*)); i++)
-      {
-         int j;
-         for(j = 0; j < out->val.map.len; j++)
+         if(!strcmp(ordered_keys[i], out->val.map.items[j].key.val.string.buff))
          {
-            if(!strcmp(ordered_keys[i], out->val.map.items[j].key.val.string.buff))
-            {
-               *ordered_pairs_outp++ = out->val.map.items[j];
-               break;
-            }
+            *ordered_pairs_outp++ = out->val.map.items[j];
+            break;
          }
       }
+   }
 
-      free(out->val.map.items);
-      out->val.map.items = ordered_pairs;
-      out->val.map.len = ordered_pairs_outp - ordered_pairs;
+   free(out->val.map.items);
+   out->val.map.items = ordered_pairs;
+   out->val.map.len = ordered_pairs_outp - ordered_pairs;
 #endif
 
    rv = 0;