diff --git a/himbaechel/uarch/gatemate/extra_data.h b/himbaechel/uarch/gatemate/extra_data.h
index 0af9a334..4ebaea43 100644
--- a/himbaechel/uarch/gatemate/extra_data.h
+++ b/himbaechel/uarch/gatemate/extra_data.h
@@ -32,8 +32,9 @@ NPNR_PACKED_STRUCT(struct GateMatePipExtraDataPOD {
     uint8_t type;
 });
 
-enum MuxFlags {
-    MUX_INVERT  = 1,
+enum MuxFlags
+{
+    MUX_INVERT = 1,
     MUX_VISIBLE = 2,
 };
 
diff --git a/himbaechel/uarch/gatemate/gatemate.cc b/himbaechel/uarch/gatemate/gatemate.cc
index 1d88f9d4..cb7aa8ae 100644
--- a/himbaechel/uarch/gatemate/gatemate.cc
+++ b/himbaechel/uarch/gatemate/gatemate.cc
@@ -59,9 +59,9 @@ bool GateMateImpl::isBelLocationValid(BelId bel, bool explain_invalid) const
         Loc loc = ctx->getBelLocation(bel);
         int x = loc.x - 2;
         int y = loc.y - 2;
-        if (x<2 || x>167)
+        if (x < 2 || x > 167)
             return false;
-        if (y<2 || y>127)
+        if (y < 2 || y > 127)
             return false;
         return true;
     }