diff --git a/himbaechel/uarch/gatemate/gatemate.cc b/himbaechel/uarch/gatemate/gatemate.cc
index 652b6720..37df51e7 100644
--- a/himbaechel/uarch/gatemate/gatemate.cc
+++ b/himbaechel/uarch/gatemate/gatemate.cc
@@ -370,14 +370,16 @@ bool GateMateImpl::checkPipAvail(PipId pip) const
     }
     if (extra_data.type == PipExtra::PIP_EXTRA_MUX && (extra_data.block != 0)) {
         if (pip_mask[pip.tile] & extra_data.block) {
-            //printf("blocking %s - > %s at %s\n",ctx->getPipName(pip)[2].c_str(ctx),ctx->getPipName(pip)[1].c_str(ctx),ctx->getPipName(pip)[0].c_str(ctx));
+            // printf("blocking %s - > %s at
+            // %s\n",ctx->getPipName(pip)[2].c_str(ctx),ctx->getPipName(pip)[1].c_str(ctx),ctx->getPipName(pip)[0].c_str(ctx));
             return false;
         }
     }
     if (extra_data.type == PipExtra::PIP_EXTRA_MUX && (extra_data.resource != 0)) {
         if (pip_mask[pip.tile] & extra_data.resource) {
             if ((pip_data[pip.tile] & extra_data.resource) != (extra_data.value ? extra_data.resource : 0)) {
-                //printf("blocking %s - > %s at %s\n",ctx->getPipName(pip)[2].c_str(ctx),ctx->getPipName(pip)[1].c_str(ctx),ctx->getPipName(pip)[0].c_str(ctx));
+                // printf("blocking %s - > %s at
+                // %s\n",ctx->getPipName(pip)[2].c_str(ctx),ctx->getPipName(pip)[1].c_str(ctx),ctx->getPipName(pip)[0].c_str(ctx));
                 return false;
             }
         }
@@ -515,18 +517,21 @@ void GateMateImpl::reassign_cplines(NetInfo *ni, const dict<WireId, PipMap> &net
             ctx->bindBel(bel, cell, PlaceStrength::STRENGTH_FIXED);
         }
         auto resource_map = dict<uint32_t, IdString>{
-                { PipMask::C_SELX,  id_C_SELX },
-                { PipMask::C_SELY1, id_C_SELY1 },
-                { PipMask::C_SELY2, id_C_SELY2 },
-                { PipMask::C_SEL_C, id_C_SEL_C },
-                { PipMask::C_SEL_P, id_C_SEL_P },
-                { PipMask::C_Y12,   id_C_Y12 },
-                { PipMask::C_CX_I,  id_C_CX_I },
-                { PipMask::C_CY1_I, id_C_CY1_I },
-                { PipMask::C_CY2_I, id_C_CY2_I },
-                { PipMask::C_PX_I,  id_C_PX_I },
-                { PipMask::C_PY1_I, id_C_PY1_I },
-                { PipMask::C_PY2_I, id_C_PY2_I, },
+                {PipMask::C_SELX, id_C_SELX},
+                {PipMask::C_SELY1, id_C_SELY1},
+                {PipMask::C_SELY2, id_C_SELY2},
+                {PipMask::C_SEL_C, id_C_SEL_C},
+                {PipMask::C_SEL_P, id_C_SEL_P},
+                {PipMask::C_Y12, id_C_Y12},
+                {PipMask::C_CX_I, id_C_CX_I},
+                {PipMask::C_CY1_I, id_C_CY1_I},
+                {PipMask::C_CY2_I, id_C_CY2_I},
+                {PipMask::C_PX_I, id_C_PX_I},
+                {PipMask::C_PY1_I, id_C_PY1_I},
+                {
+                        PipMask::C_PY2_I,
+                        id_C_PY2_I,
+                },
         };
 
         NPNR_ASSERT(resource_map.count(extra_data.resource));
diff --git a/himbaechel/uarch/gatemate/gfx.cc b/himbaechel/uarch/gatemate/gfx.cc
index a4325475..c187283d 100644
--- a/himbaechel/uarch/gatemate/gfx.cc
+++ b/himbaechel/uarch/gatemate/gfx.cc
@@ -47,7 +47,7 @@ void GateMateImpl::drawBel(std::vector<GraphicElement> &g, GraphicElement::style
         el.y1 = loc.y + 0.25;
         el.y2 = el.y1 + 0.50;
         g.push_back(el);
-        break;        
+        break;
     case id_CPE_LT_L.index:
         el.x1 = loc.x + 0.20;
         el.x2 = el.x1 + 0.20;