diff --git a/management/command-dispatcher/main.cf b/management/command-dispatcher/main.cf
index 2a30996..75598ba 100644
--- a/management/command-dispatcher/main.cf
+++ b/management/command-dispatcher/main.cf
@@ -31,13 +31,6 @@ bundle agent main
           "5"
         );
 
-  reports:
-    enabled::
-      "Command [$(i)]: $(_command[$(i)]), condition: $(_condition[$(i)]), ifelapsed: $(_ifelapsed[$(i)])";
-
-    !enabled::
-      "Command-dispatcher: commands_to_run variable not found";
-
   commands:
     enabled::
       "$(_command[$(i)])"
diff --git a/management/manage-fwupd/main.cf b/management/manage-fwupd/main.cf
index f62cc43..5304c72 100644
--- a/management/manage-fwupd/main.cf
+++ b/management/manage-fwupd/main.cf
@@ -133,6 +133,7 @@ bundle agent main
       "fwupd-refresh.timer"
         service_policy => "enabled",
         comment => "Ensure the fwupd metadata refresh timer is enabled so the LVFS firmware catalog stays current";
+
   # --- Stale marker cleanup ----------------------------------------
   files:
     linux::
@@ -140,6 +141,7 @@ bundle agent main
         delete => default:tidy,
         if => not("_update_applied"),
         comment => "Remove stale marker from a previous boot cycle";
+
   # --- Apply firmware updates --------------------------------------
   commands:
     linux.default:have_fwupdmgr.manage_fwupd:apply_updates::
@@ -151,6 +153,7 @@ bundle agent main
         if => and("_device_allowed_$(_dev_idx)", not("_update_applied")),
         classes => default:results("bundle", "manage_fwupd_update_$(_dev_idx)"),
         comment => "Apply firmware update to allowed device $(_dev_name[$(_dev_idx)])";
+
   # --- Post-update marker and reboot --------------------------------
   files:
     linux.default:have_fwupdmgr.manage_fwupd:apply_updates::
@@ -184,6 +187,7 @@ bundle agent main
         },
         handle => "manage_fwupd_reboot_after_update_fallback",
         comment => "Fallback reboot for non-systemd systems (shutdown -r +1)";
+
   # --- Inventory --------------------------------------------------
   vars:
     linux.default:have_fwupdmgr::
diff --git a/management/package-method-winget/package-method-winget.cf b/management/package-method-winget/package-method-winget.cf
index c393c31..6fccf5b 100644
--- a/management/package-method-winget/package-method-winget.cf
+++ b/management/package-method-winget/package-method-winget.cf
@@ -6,6 +6,7 @@ body package_method winget
   package_name_convention => "$(name)";
   package_delete_convention => "$(name)";
   package_installed_regex => ".*";
+
   # Note that package_list_name_regex does not allow for commas inside of package names as parsing that from ConvertTo-Csv below would be too complex
   # an example of output of the package_list_command below is
   #
@@ -14,6 +15,7 @@ body package_method winget
   # so the matches below simply grab the thing before or after the comma separating Id and InstalledVersion fields.
   package_list_name_regex => '^"([^"]*)",.*';
   package_list_version_regex => '.*,"([^"]*)".*';
+
   # Here we use the Get-WinGetPackage Cmdlet because it is easier to produce easily parsed information that way
   package_list_command => "$(sys.winsysdir)\\WindowsPowerShell\\v1.0\\powershell.exe -Command \"Get-WinGetPackage | Select Id,InstalledVersion | ConvertTo-Csv ";
   package_delete_command => "$(sys.winsysdir)\\WindowsPowerShell\\v1.0\\powershell.exe -Command \"Uninstall-WinGetPackage ";