diff --git a/himbaechel/uarch/gatemate/gatemate.cc b/himbaechel/uarch/gatemate/gatemate.cc
index 361fe656..033cd332 100644
--- a/himbaechel/uarch/gatemate/gatemate.cc
+++ b/himbaechel/uarch/gatemate/gatemate.cc
@@ -373,7 +373,8 @@ bool GateMateImpl::checkPipAvail(PipId pip) const
         if (extra_data.value == 1 && IdString(extra_data.name).in(id_C_CLKSEL, id_C_ENSEL))
             return false;
     }
-    if (!use_cp_for_cpe && extra_data.type == PipExtra::PIP_EXTRA_MUX && extra_data.resource !=0 && extra_data.resource <= PipMask::C_PY2_I) {
+    if (!use_cp_for_cpe && extra_data.type == PipExtra::PIP_EXTRA_MUX && extra_data.resource != 0 &&
+        extra_data.resource <= PipMask::C_PY2_I) {
         return false;
     }
     if (!use_bridges && extra_data.type == PipExtra::PIP_EXTRA_MUX &&
diff --git a/himbaechel/uarch/gatemate/gatemate.h b/himbaechel/uarch/gatemate/gatemate.h
index 2d2d55e6..3506b073 100644
--- a/himbaechel/uarch/gatemate/gatemate.h
+++ b/himbaechel/uarch/gatemate/gatemate.h
@@ -114,7 +114,7 @@ struct GateMateImpl : HimbaechelAPI
     MultiDieStrategy strategy;
     dict<int, IdString> index_to_die;
     dict<IdString, int> die_to_index;
-    dict<IdString,dict<IdString, IdString>> pass_backtrace;
+    dict<IdString, dict<IdString, IdString>> pass_backtrace;
 
   private:
     bool getChildPlacement(const BaseClusterInfo *cluster, Loc root_loc,
diff --git a/himbaechel/uarch/gatemate/route_clock.cc b/himbaechel/uarch/gatemate/route_clock.cc
index ecf5ef67..101e0fa7 100644
--- a/himbaechel/uarch/gatemate/route_clock.cc
+++ b/himbaechel/uarch/gatemate/route_clock.cc
@@ -154,7 +154,7 @@ void GateMateImpl::route_clock()
                 const auto &extra_data = *pip_extra_data(dh);
                 // Allow only CINY2->COUTY2 pass through for clock router
                 if (extra_data.type == PipExtra::PIP_EXTRA_MUX && extra_data.resource != 0) {
-                    if (!(extra_data.resource == PipMask::C_CY2_I && extra_data.value ==0))
+                    if (!(extra_data.resource == PipMask::C_CY2_I && extra_data.value == 0))
                         continue;
                 }
                 if (!ctx->checkPipAvailForNet(dh, clk_net))