diff --git a/himbaechel/uarch/gowin/gowin.h b/himbaechel/uarch/gowin/gowin.h
index 62f3d411..8dd13a5b 100644
--- a/himbaechel/uarch/gowin/gowin.h
+++ b/himbaechel/uarch/gowin/gowin.h
@@ -19,8 +19,8 @@ inline bool type_is_dff(IdString cell_type)
 // Return true if a cell is a latch (before packing converts them to DFFs)
 inline bool type_is_latch(IdString cell_type)
 {
-    return cell_type.in(id_DL, id_DLE, id_DLN, id_DLNE, id_DLC, id_DLCE, id_DLNC, id_DLNCE, id_DLP, id_DLPE,
-                        id_DLNP, id_DLNPE);
+    return cell_type.in(id_DL, id_DLE, id_DLN, id_DLNE, id_DLC, id_DLCE, id_DLNC, id_DLNCE, id_DLP, id_DLPE, id_DLNP,
+                        id_DLNPE);
 }
 inline bool is_dff(const CellInfo *cell) { return type_is_dff(cell->type); }
 // Return true if a cell is a ALU
diff --git a/himbaechel/uarch/gowin/pack_luts.cc b/himbaechel/uarch/gowin/pack_luts.cc
index 1a7dac9e..3e913615 100644
--- a/himbaechel/uarch/gowin/pack_luts.cc
+++ b/himbaechel/uarch/gowin/pack_luts.cc
@@ -511,12 +511,9 @@ void GowinPacker::pack_latches(void)
     // Latch-to-DFF type mapping: latches use the same BEL as DFFs,
     // just with REGMODE set to LATCH instead of FF.
     const dict<IdString, IdString> latch_to_dff = {
-        {id_DL, id_DFF},       {id_DLE, id_DFFE},
-        {id_DLN, id_DFFN},     {id_DLNE, id_DFFNE},
-        {id_DLC, id_DFFC},     {id_DLCE, id_DFFCE},
-        {id_DLNC, id_DFFNC},   {id_DLNCE, id_DFFNCE},
-        {id_DLP, id_DFFP},     {id_DLPE, id_DFFPE},
-        {id_DLNP, id_DFFNP},   {id_DLNPE, id_DFFNPE},
+            {id_DL, id_DFF},   {id_DLE, id_DFFE},   {id_DLN, id_DFFN},   {id_DLNE, id_DFFNE},
+            {id_DLC, id_DFFC}, {id_DLCE, id_DFFCE}, {id_DLNC, id_DFFNC}, {id_DLNCE, id_DFFNCE},
+            {id_DLP, id_DFFP}, {id_DLPE, id_DFFPE}, {id_DLNP, id_DFFNP}, {id_DLNPE, id_DFFNPE},
     };
 
     int converted = 0;