diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp
index 41ff2fd6ee..9c0b6816a0 100644
--- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp
+++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp
@@ -84,38 +84,40 @@ static rct_window_event_list window_ride_demolish_events = {
     nullptr,
     nullptr,
     window_ride_demolish_paint,
-    nullptr
+    nullptr,
 };
 // clang-format on
 
-static rct_window_event_list window_ride_refurbish_events = { nullptr,
-                                                              window_ride_refurbish_mouseup,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              nullptr,
-                                                              window_ride_refurbish_paint,
-                                                              nullptr };
+static rct_window_event_list window_ride_refurbish_events = {
+    nullptr,
+    window_ride_refurbish_mouseup,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    window_ride_refurbish_paint,
+    nullptr,
+};
 
 /** Based off of rct2: 0x006B486A */
 rct_window* window_ride_demolish_prompt_open(int32_t rideIndex)
diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp
index 4192fce246..f70d30845d 100644
--- a/src/openrct2-ui/windows/Dropdown.cpp
+++ b/src/openrct2-ui/windows/Dropdown.cpp
@@ -22,8 +22,9 @@
 
 #define DROPDOWN_ITEM_HEIGHT 12
 
-int32_t gAppropriateImageDropdownItemsPerRow[] = { 1, 1, 1, 1, 2, 2, 3, 3, 4, 3, 5, 4, 4, 5, 5, 5, 4,
-                                                   5, 6, 5, 5, 7, 4, 5, 6, 5, 6, 6, 6, 6, 6, 8, 8, 0 };
+int32_t gAppropriateImageDropdownItemsPerRow[] = {
+    1, 1, 1, 1, 2, 2, 3, 3, 4, 3, 5, 4, 4, 5, 5, 5, 4, 5, 6, 5, 5, 7, 4, 5, 6, 5, 6, 6, 6, 6, 6, 8, 8, 0,
+};
 
 enum
 {
diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp
index 32b4c1c5e7..cd55ad85e2 100644
--- a/src/openrct2-ui/windows/EditorInventionsList.cpp
+++ b/src/openrct2-ui/windows/EditorInventionsList.cpp
@@ -811,9 +811,8 @@ static void window_editor_inventions_list_scrollpaint(rct_window* w, rct_drawpix
         if (researchItem->type == RESEARCH_ENTRY_TYPE_RIDE
             && !RideGroupManager::RideTypeIsIndependent(researchItem->baseRideType))
         {
-            const rct_string_id rideGroupName = get_ride_naming(
-                                                    researchItem->baseRideType, get_ride_entry(researchItem->entryIndex))
-                                                    .name;
+            const auto rideEntry = get_ride_entry(researchItem->entryIndex);
+            const rct_string_id rideGroupName = get_ride_naming(researchItem->baseRideType, rideEntry).name;
             format_string(
                 groupNamePtr, Util::CountOf(groupNameBuffer), STR_INVENTIONS_LIST_RIDE_AND_VEHICLE_NAME, (void*)&rideGroupName);
             format_string(vehicleNamePtr, Util::CountOf(vehicleNameBuffer), itemNameId, nullptr);
@@ -856,10 +855,12 @@ static void window_editor_inventions_list_drag_open(rct_research_item* researchI
     ptr = buffer;
     if (researchItem->type == RESEARCH_ENTRY_TYPE_RIDE && !RideGroupManager::RideTypeIsIndependent(researchItem->baseRideType))
     {
-        const rct_string_id rideGroupName = get_ride_naming(
-                                                researchItem->baseRideType, get_ride_entry(researchItem->entryIndex))
-                                                .name;
-        rct_string_id args[] = { rideGroupName, stringId };
+        const auto rideEntry = get_ride_entry(researchItem->entryIndex);
+        const rct_string_id rideGroupName = get_ride_naming(researchItem->baseRideType, rideEntry).name;
+        rct_string_id args[] = {
+            rideGroupName,
+            stringId,
+        };
         format_string(ptr, 256, STR_INVENTIONS_LIST_RIDE_AND_VEHICLE_NAME, &args);
     }
     else