diff --git a/lib/open_food_network/order_grouper.rb b/lib/open_food_network/order_grouper.rb
index 5225f3d34e..5b792bd5d4 100644
--- a/lib/open_food_network/order_grouper.rb
+++ b/lib/open_food_network/order_grouper.rb
@@ -24,9 +24,12 @@ module OpenFoodNetwork
       sorted_groups.each do |property, items_by_property|
         branch[property] = build_tree(items_by_property, remaining_rules)
 
-        unless rule[:summary_columns].nil? || is_leaf_node(branch[property])
-          branch[property][:summary_row] = { items: items_by_property, columns: rule[:summary_columns] }
-        end
+        next if rule[:summary_columns].nil? || is_leaf_node(branch[property])
+
+        branch[property][:summary_row] = {
+          items: items_by_property,
+          columns: rule[:summary_columns]
+        }
       end
 
       branch
diff --git a/lib/open_food_network/orders_and_fulfillments_report.rb b/lib/open_food_network/orders_and_fulfillments_report.rb
index 3ec39d17e4..19343a9a48 100644
--- a/lib/open_food_network/orders_and_fulfillments_report.rb
+++ b/lib/open_food_network/orders_and_fulfillments_report.rb
@@ -97,10 +97,10 @@ module OpenFoodNetwork
               proc { |_line_items| "" }
             ]
           },
-         {
-           group_by: proc { |line_item| line_item.order.distributor },
-           sort_by: proc { |distributor| distributor.name }
-         }
+          {
+            group_by: proc { |line_item| line_item.order.distributor },
+            sort_by: proc { |distributor| distributor.name }
+          }
         ]
       when "order_cycle_distributor_totals_by_supplier"
         [
@@ -311,17 +311,24 @@ module OpenFoodNetwork
     end
 
     def total_units(line_items)
-      return " " if line_items.map{ |li| li.unit_value.nil? }.any?
+      return " " if not_all_have_unit?(line_items)
 
       total_units = line_items.sum do |li|
         product = find_variant(li.variant_id).product
-
-        scale_factor = ( product.variant_unit == 'weight' ? 1000 : 1 )
-        li.quantity * li.unit_value / scale_factor
+        li.quantity * li.unit_value / scale_factor(product)
       end
+
       total_units.round(3)
     end
 
+    def not_all_have_unit?(line_items)
+      line_items.map { |li| li.unit_value.nil? }.any?
+    end
+
+    def scale_factor(product)
+      product.variant_unit == 'weight' ? 1000 : 1
+    end
+
     # Returns the variant with the given id, including soft-deleted ones
     def find_variant(id)
       Spree::Variant.unscoped.find(id)