diff --git a/modules.d/01systemd-coredump/module-setup.sh b/modules.d/01systemd-coredump/module-setup.sh
index bbf7eac0..1a378642 100755
--- a/modules.d/01systemd-coredump/module-setup.sh
+++ b/modules.d/01systemd-coredump/module-setup.sh
@@ -48,17 +48,17 @@ install() {
     # Install the required directories.
     inst_dir   /var/lib/systemd/coredump
     # Install the required file(s.
+    # Install the kernel configuration parameters for coredump.
+    # Install vendor configuration files.
+    # Install the systemd type service unit for coredump.
+    # Install the binary executable(s) for sysusers.
     inst_multiple -o \
-        # Install the kernel configuration parameters for coredump.
         $sysctld/50-coredump.conf \
-        # Install vendor configuration files.
         $systemdutildir/coredump.conf \
-        # Install the systemd type service unit for coredump.
         $systemdsystemunitdir/systemd-coredump \
         $systemdsystemunitdir/systemd-coredump.socket \
         $systemdsystemunitdir/systemd-coredump@.service\
-        $systemdsystemunitdir/sockets.target.wants/systemd-coredump.socket
-        # Install the binary executable(s) for sysusers.
+        $systemdsystemunitdir/sockets.target.wants/systemd-coredump.socket \
         coredumpctl
 
     # Install the hosts local user configurations if enabled.
diff --git a/modules.d/01systemd-repart/module-setup.sh b/modules.d/01systemd-repart/module-setup.sh
index 4b1c6ac5..99500d6e 100755
--- a/modules.d/01systemd-repart/module-setup.sh
+++ b/modules.d/01systemd-repart/module-setup.sh
@@ -34,14 +34,13 @@ depends() {
 # Install the required file(s) for the module in the initramfs.
 install() {
 
-    # Install the required file(s.
+    # Install vendor repartition configurations
+    # Install the systemd type service unit for systemd repart.
+    # Install the binary executable(s) for systemd repart
     inst_multiple -o \
-        # Install vendor repartition configurations
-        $libdir/repart.d/*.conf
-        # Install the systemd type service unit for systemd repart.
+        $libdir/repart.d/*.conf \
         $systemdsystemunitdir/systemd-repart.service \
-        $systemdsystemunitdir/initrd-root-fs.target.wants/systemd-repart.service
-        # Install the binary executable(s) for systemd repart.
+        $systemdsystemunitdir/initrd-root-fs.target.wants/systemd-repart.service \
         systemd-repart
 
     # Install the hosts local user configurations if enabled.
diff --git a/modules.d/01systemd-sysusers/module-setup.sh b/modules.d/01systemd-sysusers/module-setup.sh
index c0962a9b..3436c8fc 100644
--- a/modules.d/01systemd-sysusers/module-setup.sh
+++ b/modules.d/01systemd-sysusers/module-setup.sh
@@ -34,14 +34,14 @@ depends() {
 # Install the required file(s) for the module in the initramfs.
 install() {
 
+    # Install the system users and groups configuration file.
+    # Install the systemd users and groups configuration file.
+    # Install the systemd type service unit for sysusers.
+    # Install the binary executable(s) for sysusers.
     inst_multiple -o \
-        # Install the system users and groups configuration file.
         $sysusers/basic.conf \
-        # Install the systemd users and groups configuration file.
         $sysusers/systemd.conf \
-        # Install the systemd type service unit for sysusers.
         $systemdsystemunitdir/systemd-sysusers.service \
-        # Install the binary executable(s) for sysusers.
         systemd-sysusers
 
         # Install the hosts local user configurations if enabled.
@@ -50,7 +50,7 @@ install() {
             $sysusersconfdir/basic.conf \
             $sysusersconfdir/systemd.conf \
             $systemdsystemconfdir/systemd-sysusers.service \
-            $systemdsystemconfdir/systemd-sysusers.service.d/*.conf
+            $systemdsystemconfdir/systemd-sysusers.service.d/*.conf \
             ${NULL}
         fi
 
diff --git a/modules.d/06dbus-broker/module-setup.sh b/modules.d/06dbus-broker/module-setup.sh
index d22031bb..317d3bd6 100755
--- a/modules.d/06dbus-broker/module-setup.sh
+++ b/modules.d/06dbus-broker/module-setup.sh
@@ -62,30 +62,30 @@ install() {
     inst_dir $dbussystemconfdir
     inst_dir $dbussystemservicesconfdir
 
+    # Install the dbus user session configuration file.
+    # Install the dbus system configuration file.
+    # The systemd module should be providing this and
+    # depend on the dbus module. Added here until it does.
+    # Install the dbus users and groups configuration file.
+    # Install the dbus-broker systemd journal message catalogs files.
+    # Install the systemd type service unit for dbus-broker.
+    # Install the systemd type socket unit for dbus.
+    # Install the dbus target.
+    # Install the binary executable(s) for dbus-broker.
     inst_multiple -o \
-        # Install the dbus user session configuration file.
         $dbus/session.conf \
-        # Install the dbus system configuration file.
         $dbus/system.conf \
-        # The systemd module should be providing this and
-        # depend on the dbus module. Added here until it does.
         $dbussystem/org.freedesktop.systemd1.conf \
         $dbusservicesconfdir/org.freedesktop.systemd1.service \
         $dbussystemservices/org.freedesktop.systemd1.service \
-        # Install the dbus users and groups configuration file.
         $sysusers/dbus.conf \
-        # Install the dbus-broker systemd journal message catalogs files.
         $systemdcatalog/dbus-broker.catalog \
         $systemdcatalog/dbus-broker-launch.catalog \
-        # Install the systemd type service unit for dbus-broker.
         $systemdsystemunitdir/dbus-broker.service \
         $systemduser/dbus-broker.service \
-        # Install the systemd type socket unit for dbus.
         $systemdsystemunitdir/dbus.socket \
         $systemduser/dbus.socket \
-        # Install the dbus target.
-        $systemdsystemunitdir/dbus.target.wants
-        # Install the binary executable(s) for dbus-broker.
+        $systemdsystemunitdir/dbus.target.wants \
         busctl dbus-broker dbus-broker-launch
 
     # Adjusting dependencies for initramfs in the dbus socket unit.
diff --git a/modules.d/06dbus-daemon/module-setup.sh b/modules.d/06dbus-daemon/module-setup.sh
index 42ab0534..b7a0950c 100755
--- a/modules.d/06dbus-daemon/module-setup.sh
+++ b/modules.d/06dbus-daemon/module-setup.sh
@@ -54,21 +54,21 @@ install() {
     inst_dir $dbussystemconfdir
     inst_dir $dbussystemservicesconfdir
 
+    # Install the dbus system configuration file.
+    # The systemd module should be providing this and
+    # depend on the dbus module. Added here until it does.
+    # Install the systemd type service unit for dbus.
+    # Install the systemd type socket unit for dbus.
+    # Install the dbus target.
+    # Install the binary executable(s) for dbus.
     inst_multiple -o \
-        # Install the dbus system configuration file.
         $dbus/system.conf \
-        # The systemd module should be providing this and
-        # depend on the dbus module. Added here until it does.
         $dbussystem/org.freedesktop.systemd1.conf \
         $dbusservicesconfdir/org.freedesktop.systemd1.service \
         $dbussystemservices/org.freedesktop.systemd1.service \
-        # Install the systemd type service unit for dbus.
         $systemdsystemunitdir/dbus.service \
-        # Install the systemd type socket unit for dbus.
         $systemdsystemunitdir/dbus.socket \
-        # Install the dbus target.
-        $systemdsystemunitdir/dbus.target.wants
-        # Install the binary executable(s) for dbus.
+        $systemdsystemunitdir/dbus.target.wants \
         busctl dbus-send dbus-daemon
 
     # Adjusting dependencies for initramfs in the dbus service unit.