diff --git a/src/openrct2/ride/coaster/HybridCoaster.cpp b/src/openrct2/ride/coaster/HybridCoaster.cpp
index 8b55b4e767..f549856003 100644
--- a/src/openrct2/ride/coaster/HybridCoaster.cpp
+++ b/src/openrct2/ride/coaster/HybridCoaster.cpp
@@ -131,26 +131,26 @@ namespace HybridRC
         {
             switch (direction)
             {
-            case 0:
-                sub_98197C_rotated(
-                    session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_LIFT_TRACK_STEEP + 12), 0, 0, 32,
-                    20, 3, height, 0, 6, height);
-                break;
-            case 1:
-                session->WoodenSupportsPrependTo = sub_98197C_rotated(
-                    session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_LIFT_TRACK_STEEP + 13), 0, 0, 2,
-                    24, 93, height, 28, 4, height - 16);
-                break;
-            case 2:
-                session->WoodenSupportsPrependTo = sub_98197C_rotated(
-                    session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_LIFT_TRACK_STEEP + 14), 0, 0, 2,
-                    24, 93, height, 28, 4, height - 16);
-                break;
-            case 3:
-                sub_98197C_rotated(
-                    session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_LIFT_TRACK_STEEP + 15), 0, 0, 32,
-                    20, 3, height, 0, 6, height);
-                break;
+                case 0:
+                    sub_98197C_rotated(
+                        session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_LIFT_TRACK_STEEP + 12), 0, 0, 32, 20, 3,
+                        height, 0, 6, height);
+                    break;
+                case 1:
+                    session->WoodenSupportsPrependTo = sub_98197C_rotated(
+                        session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_LIFT_TRACK_STEEP + 13), 0, 0, 2, 24, 93,
+                        height, 28, 4, height - 16);
+                    break;
+                case 2:
+                    session->WoodenSupportsPrependTo = sub_98197C_rotated(
+                        session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_LIFT_TRACK_STEEP + 14), 0, 0, 2, 24, 93,
+                        height, 28, 4, height - 16);
+                    break;
+                case 3:
+                    sub_98197C_rotated(
+                        session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_LIFT_TRACK_STEEP + 15), 0, 0, 32, 20, 3,
+                        height, 0, 6, height);
+                    break;
             }
         }
         else
@@ -159,23 +159,23 @@ namespace HybridRC
             {
                 case 0:
                     sub_98197C_rotated(
-                        session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_STEEP + 12), 0, 0, 32, 20, 3,
-                        height, 0, 6, height);
+                        session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_STEEP + 12), 0, 0, 32, 20, 3, height,
+                        0, 6, height);
                     break;
                 case 1:
                     session->WoodenSupportsPrependTo = sub_98197C_rotated(
-                        session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_STEEP + 13), 0, 0, 2, 24, 93,
-                        height, 28, 4, height - 16);
+                        session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_STEEP + 13), 0, 0, 2, 24, 93, height,
+                        28, 4, height - 16);
                     break;
                 case 2:
                     session->WoodenSupportsPrependTo = sub_98197C_rotated(
-                        session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_STEEP + 14), 0, 0, 2, 24, 93,
-                        height, 28, 4, height - 16);
+                        session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_STEEP + 14), 0, 0, 2, 24, 93, height,
+                        28, 4, height - 16);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_STEEP + 15), 0, 0, 32, 20, 3,
-                        height, 0, 6, height);
+                        session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_STEEP + 15), 0, 0, 32, 20, 3, height,
+                        0, 6, height);
                     break;
             }
         }
@@ -471,23 +471,23 @@ namespace HybridRC
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 8), 0, 0, 2,
-                            20, 31, height, 4, 6, height + 8);
+                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 8), 0, 0, 2, 20, 31,
+                            height, 4, 6, height + 8);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 9), 0, 0, 2,
-                            20, 31, height, 24, 6, height + 8);
+                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 9), 0, 0, 2, 20, 31,
+                            height, 24, 6, height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 10), 0, 0, 2,
-                            20, 31, height, 24, 6, height + 8);
+                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 10), 0, 0, 2, 20, 31,
+                            height, 24, 6, height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 11), 0, 0, 2,
-                            20, 31, height, 4, 6, height + 8);
+                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 11), 0, 0, 2, 20, 31,
+                            height, 4, 6, height + 8);
                         break;
                 }
                 paint_util_set_vertical_tunnel(session, height + 32);
@@ -517,23 +517,23 @@ namespace HybridRC
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 0), 0, 0, 32,
-                            20, 3, height, 0, 6, height);
+                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 0), 0, 0, 32, 20, 3,
+                            height, 0, 6, height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 1), 0, 0, 2,
-                            20, 55, height, 24, 6, height);
+                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 1), 0, 0, 2, 20, 55,
+                            height, 24, 6, height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 2), 0, 0, 2,
-                            20, 55, height, 24, 6, height);
+                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 2), 0, 0, 2, 20, 55,
+                            height, 24, 6, height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 3), 0, 0, 32,
-                            20, 3, height, 0, 6, height);
+                            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 3), 0, 0, 32, 20, 3,
+                            height, 0, 6, height);
                         break;
                 }
                 wooden_a_supports_paint_setup(
@@ -566,23 +566,23 @@ namespace HybridRC
         {
             case 0:
                 sub_98197C_rotated(
-                    session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 4), 0, 0, 32, 20, 3,
-                    height, 0, 6, height + 8);
+                    session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 4), 0, 0, 32, 20, 3, height,
+                    0, 6, height + 8);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 5), 0, 0, 2, 20, 31,
-                    height, 24, 6, height + 8);
+                    session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 5), 0, 0, 2, 20, 31, height,
+                    24, 6, height + 8);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 6), 0, 0, 2, 20, 31,
-                    height, 24, 6, height + 8);
+                    session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 6), 0, 0, 2, 20, 31, height,
+                    24, 6, height + 8);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 7), 0, 0, 32, 20, 3,
-                    height, 0, 6, height + 8);
+                    session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_VERTICAL + 7), 0, 0, 32, 20, 3, height,
+                    0, 6, height + 8);
                 break;
         }
         switch (direction)
@@ -10108,8 +10108,8 @@ namespace HybridRC
     {
         sub_98196C_rotated(session, direction, IMAGE_TYPE_REMAP | SPR_STATION_BASE_D, 0, 0, 32, 32, 1, height);
         sub_98197C_rotated(
-            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_FLAT + (direction & 1)), 0, 0, 32, 20, 0, height, 0, 6,
-            height + 3);
+            session, direction, GetTrackColour(session) | (SPR_G2_HYBRID_TRACK_FLAT + (direction & 1)), 0, 0, 32, 20, 0, height,
+            0, 6, height + 3);
         track_paint_util_onride_photo_paint(session, direction, height + 3, tileElement);
         wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
         paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_SQUARE_FLAT);