diff --git a/common/design_utils.cc b/common/design_utils.cc
index fa914ee2..92533fa3 100644
--- a/common/design_utils.cc
+++ b/common/design_utils.cc
@@ -69,8 +69,8 @@ void print_utilisation(const Context *ctx)
     for (auto type : available_types) {
         IdString type_id = ctx->belTypeToId(type.first);
         int used_bels = get_or_default(used_types, type.first, 0);
-        log_info("\t%20s: %5d/%5d %5d%%\n", type_id.c_str(ctx),
-                 used_bels, type.second, 100*used_bels/type.second);
+        log_info("\t%20s: %5d/%5d %5d%%\n", type_id.c_str(ctx), used_bels,
+                 type.second, 100 * used_bels / type.second);
     }
     log_break();
 }
diff --git a/common/nextpnr.cc b/common/nextpnr.cc
index 144da7c8..b24f66ea 100644
--- a/common/nextpnr.cc
+++ b/common/nextpnr.cc
@@ -66,8 +66,7 @@ uint32_t Context::checksum() const
     uint32_t cksum = xorshift32(123456789);
 
     uint32_t cksum_nets_sum = 0;
-    for (auto &it : nets)
-    {
+    for (auto &it : nets) {
         auto &ni = *it.second;
         uint32_t x = 123456789;
         x = xorshift32(x + xorshift32(it.first.index));
@@ -117,8 +116,7 @@ uint32_t Context::checksum() const
     cksum = xorshift32(cksum + xorshift32(cksum_nets_sum));
 
     uint32_t cksum_cells_sum = 0;
-    for (auto &it : cells)
-    {
+    for (auto &it : cells) {
         auto &ci = *it.second;
         uint32_t x = 123456789;
         x = xorshift32(x + xorshift32(it.first.index));
@@ -131,7 +129,8 @@ uint32_t Context::checksum() const
             port_x = xorshift32(port_x + xorshift32(p.first.index));
             port_x = xorshift32(port_x + xorshift32(p.second.name.index));
             if (p.second.net)
-                port_x = xorshift32(port_x + xorshift32(p.second.net->name.index));
+                port_x = xorshift32(port_x +
+                                    xorshift32(p.second.net->name.index));
             port_x = xorshift32(port_x + xorshift32(p.second.type));
             port_x_sum += port_x;
         }
diff --git a/common/route.cc b/common/route.cc
index e6697349..967f9aa1 100644
--- a/common/route.cc
+++ b/common/route.cc
@@ -129,12 +129,13 @@ struct Router
         int thisVisitCnt = 0;
         int thisVisitCntLimit = 0;
 
-        while (!queue.empty() && (thisVisitCntLimit == 0 || thisVisitCnt < thisVisitCntLimit)) {
+        while (!queue.empty() &&
+               (thisVisitCntLimit == 0 || thisVisitCnt < thisVisitCntLimit)) {
             QueuedWire qw = queue.top();
             queue.pop();
 
             if (thisVisitCntLimit == 0 && visited.count(dst_wire))
-                thisVisitCntLimit = (thisVisitCnt*3)/2;
+                thisVisitCntLimit = (thisVisitCnt * 3) / 2;
 
             for (auto pip : ctx->getPipsDownhill(qw.wire)) {
                 delay_t next_delay =
@@ -500,7 +501,8 @@ bool route_design(Context *ctx)
             if (ctx->verbose)
                 log_info("-- %d --\n", iterCnt);
 
-            int visitCnt = 0, revisitCnt = 0, overtimeRevisitCnt = 0, netCnt = 0;
+            int visitCnt = 0, revisitCnt = 0, overtimeRevisitCnt = 0,
+                netCnt = 0;
 
             std::unordered_set<IdString> ripupQueue;
 
@@ -549,8 +551,10 @@ bool route_design(Context *ctx)
                          netCnt, normalRouteCnt, int(ripupQueue.size()));
 
             if (ctx->verbose)
-                log_info("  visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits).\n",
-                         visitCnt, (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt);
+                log_info("  visited %d PIPs (%.2f%% revisits, %.2f%% overtime "
+                         "revisits).\n",
+                         visitCnt, (100.0 * revisitCnt) / visitCnt,
+                         (100.0 * overtimeRevisitCnt) / visitCnt);
 
             if (!ripupQueue.empty()) {
                 if (ctx->verbose || iterCnt == 1)
@@ -616,8 +620,10 @@ bool route_design(Context *ctx)
                              ripCnt);
 
                 if (ctx->verbose)
-                    log_info("  visited %d PIPs (%.2f%% revisits, %.2f%% overtime revisits).\n",
-                             visitCnt, (100.0 * revisitCnt) / visitCnt, (100.0 * overtimeRevisitCnt) / visitCnt);
+                    log_info("  visited %d PIPs (%.2f%% revisits, %.2f%% "
+                             "overtime revisits).\n",
+                             visitCnt, (100.0 * revisitCnt) / visitCnt,
+                             (100.0 * overtimeRevisitCnt) / visitCnt);
 
                 if (ctx->verbose && !netsQueue.empty())
                     log_info("  ripped up %d previously routed nets. continue "
diff --git a/ice40/arch.h b/ice40/arch.h
index 7778e1c5..f3a46f5c 100644
--- a/ice40/arch.h
+++ b/ice40/arch.h
@@ -515,10 +515,7 @@ struct Arch : BaseCtx
         return id(chip_info->bel_data[bel.index].name.get());
     }
 
-    uint32_t getBelChecksum(BelId bel) const
-    {
-        return bel.index;
-    }
+    uint32_t getBelChecksum(BelId bel) const { return bel.index; }
 
     void bindBel(BelId bel, IdString cell)
     {
@@ -612,10 +609,7 @@ struct Arch : BaseCtx
         return id(chip_info->wire_data[wire.index].name.get());
     }
 
-    uint32_t getWireChecksum(WireId wire) const
-    {
-        return wire.index;
-    }
+    uint32_t getWireChecksum(WireId wire) const { return wire.index; }
 
     void bindWire(WireId wire, IdString net)
     {
@@ -656,10 +650,7 @@ struct Arch : BaseCtx
     PipId getPipByName(IdString name) const;
     IdString getPipName(PipId pip) const;
 
-    uint32_t getPipChecksum(PipId pip) const
-    {
-        return pip.index;
-    }
+    uint32_t getPipChecksum(PipId pip) const { return pip.index; }
 
     void bindPip(PipId pip, IdString net)
     {