diff --git a/modules/programs/step-client.nix b/modules/programs/step-client.nix
index 48ae0d2..5c322e3 100644
--- a/modules/programs/step-client.nix
+++ b/modules/programs/step-client.nix
@@ -18,7 +18,6 @@
       };
       principals = lib.mkOption {
         type = lib.types.listOf lib.types.str;
-        # default = [ ];
       };
     };
     config = lib.mkIf cfg.enable {
diff --git a/modules/services/restic/restic.nix b/modules/services/restic/default.nix
similarity index 100%
rename from modules/services/restic/restic.nix
rename to modules/services/restic/default.nix
diff --git a/modules/services/step-ca/mtls.nix b/modules/services/step-ca/mtls.nix
index e083f00..8ec5f1f 100644
--- a/modules/services/step-ca/mtls.nix
+++ b/modules/services/step-ca/mtls.nix
@@ -84,9 +84,12 @@ let
     systemctlArgs ? [ ],
   }:
   let
+    systemctl = lib.getExe' pkgs.systemd "systemctl";
+    escapedArgs = lib.escapeShellArgs systemctlArgs;
+    systemctlCommand = "${systemctl} ${escapedArgs}";
     renewReloadScript = lib.concatMapStringsSep "\n" (unit: ''
-      if ${lib.getExe' pkgs.systemd "systemctl"} ${lib.escapeShellArgs systemctlArgs} --quiet is-active "${unit}"; then
-        ${lib.getExe' pkgs.systemd "systemctl"} ${lib.escapeShellArgs systemctlArgs} try-reload-or-restart "${unit}"
+      if ${systemctlCommand} --quiet is-active "${unit}"; then
+        ${systemctlCommand} try-reload-or-restart "${unit}"
       fi
     '') reloadUnits;
     renewPostCommands = lib.concatStringsSep "\n" postCommands;