diff --git a/units/commodity_definitions.hpp b/units/commodity_definitions.hpp
index 5c17220e..3662b97c 100644
--- a/units/commodity_definitions.hpp
+++ b/units/commodity_definitions.hpp
@@ -517,9 +517,10 @@ namespace commodities {
         choline_chloride = generateHarmonizedCode(29, 23, 10),
     };
 
-    constexpr std::uint32_t package(std::uint32_t packaging, std::uint32_t commodity)
+    constexpr std::uint32_t
+        package(std::uint32_t packaging, std::uint32_t commodity)
     {
-        return packaging|commodity;
+        return packaging | commodity;
     }
 }  // namespace commodities
 
diff --git a/units/r20_conv.cpp b/units/r20_conv.cpp
index 4b05c5f7..e0eb1da9 100644
--- a/units/r20_conv.cpp
+++ b/units/r20_conv.cpp
@@ -1973,7 +1973,11 @@ namespace precise {
         unitD{
             "KLK",
             "lactic dry material percentage",
-            {1.0, percent, commodities::package(commodities::packaging::dry,commodities::milk)}},
+            {1.0,
+             percent,
+             commodities::package(
+                 commodities::packaging::dry,
+                 commodities::milk)}},
         unitD{"KLX", "kilolux", kilo* lux},
         unitD{
             "KMA",
@@ -1991,7 +1995,9 @@ namespace precise {
             "milliequivalence caustic potash per gram of product",
             {1.0,
              milli / g,
-             commodities::package(commodities::packaging::equivalent,commodities::chemicals::KOH)}},
+             commodities::package(
+                 commodities::packaging::equivalent,
+                 commodities::chemicals::KOH)}},
         unitD{"KPA", "kilopascal", kilo* Pa},
         unitD{
             "KPH",
@@ -2146,7 +2152,9 @@ namespace precise {
             "lactose excess percentage",
             {1.0,
              percent,
-             commodities::package(commodities::packaging::excess,commodities::lactose)}},
+             commodities::package(
+                 commodities::packaging::excess,
+                 commodities::lactose)}},
         unitD{"LBR", "pound", lb},
         unitD{"LBT", "troy pound (US)", troy::pound},
         unitD{
@@ -2764,7 +2772,8 @@ namespace precise {
             "proof litre",
             {1.0,
              L,
-             commodities::package(commodities::packaging::equivalent,
+             commodities::package(
+                 commodities::packaging::equivalent,
                  commodities::chemicals::alcohol)}},
         unitD{"PG", "plate", {1.0, count, commodities::packaging::plate}},
         unitD{
@@ -2772,7 +2781,8 @@ namespace precise {
             "proof gallon",
             {1.0,
              gal,
-             commodities::package(commodities::packaging::equivalent,
+             commodities::package(
+                 commodities::packaging::equivalent,
                  commodities::chemicals::alcohol)}},
         unitD{"PI", "pitch", {1.0, count / in, commodities::character}},
         unitD{"PK", "pack", {1.0, count, commodities::packaging::pack}},
@@ -2836,14 +2846,22 @@ namespace precise {
         unitD{
             "QB",
             "page - hardcopy",
-            {1.0, count, commodities::package(commodities::packaging::page,commodities::paper)}},
+            {1.0,
+             count,
+             commodities::package(
+                 commodities::packaging::page,
+                 commodities::paper)}},
         unitD{"QD", "quarter dozen", {3, one}},
         unitD{"QH", "quarter hour", {0.25, hr}},
         unitD{"QK", "quarter kilogram", {0.25, kg}},
         unitD{
             "QR",
             "quire",
-            {25.0, count, commodities::package(commodities::packaging::sheet,commodities::paper)}},
+            {25.0,
+             count,
+             commodities::package(
+                 commodities::packaging::sheet,
+                 commodities::paper)}},
         unitD{"QT", "quart (US)", us::quart},
         unitD{"QTD", "dry quart (US)", us::dry::quart},
         unitD{"QTI", "quart (UK)", imp::quart},
@@ -2934,7 +2952,9 @@ namespace precise {
             "stick, cigarette",
             {1.0,
              count,
-             commodities::package(commodities::packaging::stick,commodities::cigarette)}},
+             commodities::package(
+                 commodities::packaging::stick,
+                 commodities::cigarette)}},
         unitD{"STL", "standard litre", L},
         unitD{"STN", "ton (US)", av::ton},
         unitD{"STW", "straw", {1.0, count, commodities::packaging::straw}},