diff --git a/file_path_special.c b/file_path_special.c
index 989499e023..afaefa8f0c 100644
--- a/file_path_special.c
+++ b/file_path_special.c
@@ -168,10 +168,11 @@ void fill_pathname_application_special(char *s,
          break;
       case APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG:
          {
-            char *s1 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-            s1[0] = '\0';
             settings_t *settings   = config_get_ptr();
+            char               *s1 = (char*)malloc(
+                  PATH_MAX_LENGTH * sizeof(char));
             const char *dir_assets = settings->paths.directory_assets;
+            s1[0] = '\0';
             fill_pathname_join(s1, dir_assets, "pkg", PATH_MAX_LENGTH * sizeof(char));
             strlcpy(s, s1, len);
             free(s1);
@@ -339,30 +340,31 @@ void fill_pathname_application_special(char *s,
 
             s1[0] = '\0';
 
-            switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE)) {
+            switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE))
+            {
                case RETRO_LANGUAGE_ARABIC:
                   fill_pathname_application_special(s1,
-                     PATH_MAX_LENGTH * sizeof(char),
-                     APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
+                        PATH_MAX_LENGTH * sizeof(char),
+                        APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
                   fill_pathname_join(s, s1, "fallback-font.ttf", len);
                   break;
                case RETRO_LANGUAGE_CHINESE_SIMPLIFIED:
                case RETRO_LANGUAGE_CHINESE_TRADITIONAL:
                   fill_pathname_application_special(s1,
-                     PATH_MAX_LENGTH * sizeof(char),
-                     APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
+                        PATH_MAX_LENGTH * sizeof(char),
+                        APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
                   fill_pathname_join(s, s1, "chinese-fallback-font.ttf", len);
                   break;
                case RETRO_LANGUAGE_KOREAN:
                   fill_pathname_application_special(s1,
-                     PATH_MAX_LENGTH * sizeof(char),
-                     APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
+                        PATH_MAX_LENGTH * sizeof(char),
+                        APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
                   fill_pathname_join(s, s1, "korean-fallback-font.ttf", len);
                   break;
                default:
                   fill_pathname_application_special(s1,
-                     PATH_MAX_LENGTH * sizeof(char),
-                     APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI);
+                        PATH_MAX_LENGTH * sizeof(char),
+                        APPLICATION_SPECIAL_DIRECTORY_ASSETS_MATERIALUI);
                   fill_pathname_join(s, s1, "font.ttf", len);
             }
 
@@ -384,30 +386,31 @@ void fill_pathname_application_special(char *s,
 
                s1[0] = '\0';
 
-               switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE)) {
+               switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE))
+               {
                   case RETRO_LANGUAGE_ARABIC:
                      fill_pathname_application_special(s1,
-                        PATH_MAX_LENGTH * sizeof(char),
-                        APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
+                           PATH_MAX_LENGTH * sizeof(char),
+                           APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
                      fill_pathname_join(s, s1, "fallback-font.ttf", len);
                      break;
                   case RETRO_LANGUAGE_CHINESE_SIMPLIFIED:
                   case RETRO_LANGUAGE_CHINESE_TRADITIONAL:
                      fill_pathname_application_special(s1,
-                        PATH_MAX_LENGTH * sizeof(char),
-                        APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
+                           PATH_MAX_LENGTH * sizeof(char),
+                           APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
                      fill_pathname_join(s, s1, "chinese-fallback-font.ttf", len);
                      break;
                   case RETRO_LANGUAGE_KOREAN:
                      fill_pathname_application_special(s1,
-                        PATH_MAX_LENGTH * sizeof(char),
-                        APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
+                           PATH_MAX_LENGTH * sizeof(char),
+                           APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
                      fill_pathname_join(s, s1, "korean-fallback-font.ttf", len);
                      break;
                   default:
                      fill_pathname_application_special(s1,
-                        PATH_MAX_LENGTH * sizeof(char),
-                        APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB);
+                           PATH_MAX_LENGTH * sizeof(char),
+                           APPLICATION_SPECIAL_DIRECTORY_ASSETS_XMB);
                      fill_pathname_join(s, s1, "font.ttf", len);
                }
                free(s1);
diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c
index 29105c268e..f290d677e3 100644
--- a/menu/drivers/ozone/ozone.c
+++ b/menu/drivers/ozone/ozone.c
@@ -576,11 +576,12 @@ static void ozone_cache_footer_labels(ozone_handle_t *ozone)
 /* Determines the size of all menu elements */
 static void ozone_set_layout(ozone_handle_t *ozone, bool is_threaded)
 {
-   float scale_factor;
-   bool font_inited;
    char font_path[PATH_MAX_LENGTH];
+   float scale_factor  = 0.0f;
+   bool font_inited    = false;
+   char *s1            = NULL;
 
-   font_path[0] = '\0';
+   font_path[0]        = '\0';
 
    if (!ozone)
       return;
@@ -636,26 +637,27 @@ static void ozone_set_layout(ozone_handle_t *ozone, bool is_threaded)
    ozone->pointer_active_delta = CURSOR_ACTIVE_DELTA * scale_factor;
 
    /* Initialise fonts */
-   char *s1 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   s1    = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
    s1[0] = '\0';
-   switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE)) {
+   switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE))
+   {
       case RETRO_LANGUAGE_ARABIC:
          fill_pathname_application_special(s1,
-            PATH_MAX_LENGTH * sizeof(char),
-            APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
+               PATH_MAX_LENGTH * sizeof(char),
+               APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
          fill_pathname_join(font_path, s1, "fallback-font.ttf", sizeof(font_path));
          break;
       case RETRO_LANGUAGE_CHINESE_SIMPLIFIED:
       case RETRO_LANGUAGE_CHINESE_TRADITIONAL:
          fill_pathname_application_special(s1,
-            PATH_MAX_LENGTH * sizeof(char),
-            APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
+               PATH_MAX_LENGTH * sizeof(char),
+               APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
          fill_pathname_join(font_path, s1, "chinese-fallback-font.ttf", sizeof(font_path));
          break;
       case RETRO_LANGUAGE_KOREAN:
          fill_pathname_application_special(s1,
-            PATH_MAX_LENGTH * sizeof(char),
-            APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
+               PATH_MAX_LENGTH * sizeof(char),
+               APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
          fill_pathname_join(font_path, s1, "korean-fallback-font.ttf", sizeof(font_path));
          break;
       default:
@@ -666,24 +668,25 @@ static void ozone_set_layout(ozone_handle_t *ozone, bool is_threaded)
          is_threaded, font_path, FONT_SIZE_TITLE * scale_factor);
    ozone->has_all_assets = ozone->has_all_assets && font_inited;
 
-   switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE)) {
+   switch (*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE))
+   {
       case RETRO_LANGUAGE_ARABIC:
          fill_pathname_application_special(s1,
-            PATH_MAX_LENGTH * sizeof(char),
-            APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
+               PATH_MAX_LENGTH * sizeof(char),
+               APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
          fill_pathname_join(font_path, s1, "fallback-font.ttf", sizeof(font_path));
          break;
       case RETRO_LANGUAGE_CHINESE_SIMPLIFIED:
       case RETRO_LANGUAGE_CHINESE_TRADITIONAL:
          fill_pathname_application_special(s1,
-            PATH_MAX_LENGTH * sizeof(char),
-            APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
+               PATH_MAX_LENGTH * sizeof(char),
+               APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
          fill_pathname_join(font_path, s1, "chinese-fallback-font.ttf", sizeof(font_path));
          break;
       case RETRO_LANGUAGE_KOREAN:
          fill_pathname_application_special(s1,
-            PATH_MAX_LENGTH * sizeof(char),
-            APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
+               PATH_MAX_LENGTH * sizeof(char),
+               APPLICATION_SPECIAL_DIRECTORY_ASSETS_PKG);
          fill_pathname_join(font_path, s1, "korean-fallback-font.ttf", sizeof(font_path));
          break;
       default: