diff --git a/menu/drivers_display/menu_display_d3d.cpp b/menu/drivers_display/menu_display_d3d.cpp
index 37ecb13f02..e4d06ad19d 100644
--- a/menu/drivers_display/menu_display_d3d.cpp
+++ b/menu/drivers_display/menu_display_d3d.cpp
@@ -126,11 +126,12 @@ static void menu_display_d3d_draw(void *data)
       draw->height = 1;
 
    if (!mat)
-      mat = (math_matrix_4x4*)menu_display_d3d_get_default_mvp();
+      mat                         = (math_matrix_4x4*)
+         menu_display_d3d_get_default_mvp();
    if (!draw->coords->vertex)
-      draw->coords->vertex = &d3d_vertexes[0];
+      draw->coords->vertex        = &d3d_vertexes[0];
    if (!draw->coords->tex_coord)
-      draw->coords->tex_coord = &d3d_tex_coords[0];
+      draw->coords->tex_coord     = &d3d_tex_coords[0];
    if (!draw->coords->lut_tex_coord)
       draw->coords->lut_tex_coord = &d3d_tex_coords[0];
 
diff --git a/menu/drivers_display/menu_display_vulkan.c b/menu/drivers_display/menu_display_vulkan.c
index 34ac46a2db..cb11361724 100644
--- a/menu/drivers_display/menu_display_vulkan.c
+++ b/menu/drivers_display/menu_display_vulkan.c
@@ -53,22 +53,24 @@ static void *menu_display_vk_get_default_mvp(void)
    return &vk->mvp_no_rot;
 }
 
-static unsigned to_display_pipeline(enum menu_display_prim_type prim_type, bool blend)
+static unsigned to_display_pipeline(
+      enum menu_display_prim_type prim_type, bool blend)
 {
    return ((prim_type == MENU_DISPLAY_PRIM_TRIANGLESTRIP) << 1) | (blend << 0);
 }
 
 static void menu_display_vk_draw(void *data)
 {
-   menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data;
-   struct vk_texture *texture;
-   const float *vertex, *tex_coord, *color;
-   math_matrix_4x4 *mat;
-   struct vk_buffer_range range;
-   struct vk_vertex *pv;
    unsigned i;
-
-   vk_t *vk = vk_get_ptr();
+   struct vk_buffer_range range;
+   struct vk_texture *texture    = NULL;
+   const float *vertex           = NULL;
+   const float *tex_coord        = NULL;
+   const float *color            = NULL;
+   math_matrix_4x4 *mat          = NULL;
+   struct vk_vertex *pv          = NULL;
+   menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data;
+   vk_t *vk                      = vk_get_ptr();
    if (!vk)
       return;
 
@@ -120,7 +122,8 @@ static void menu_display_vk_draw(void *data)
 
    {
       const struct vk_draw_triangles call = {
-         vk->display.pipelines[to_display_pipeline(draw->prim_type, vk->display.blend)],
+         vk->display.pipelines[
+            to_display_pipeline(draw->prim_type, vk->display.blend)],
          texture,
          texture->default_smooth ? vk->samplers.linear : vk->samplers.nearest,
          mat,