diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
index 6f0808c413495b..38a4e5dd27eca5 100644
--- a/src/controller/CHIPDeviceController.cpp
+++ b/src/controller/CHIPDeviceController.cpp
@@ -1758,7 +1758,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio
     {
     case CommissioningStage::kArmFailsafe: {
         GeneralCommissioning::Commands::ArmFailSafe::Type request;
-        request.expiryLengthSeconds = params.GetFailsafeTimerSeconds().ValueOr(params.kDefaultFailsafeTimeout);
+        request.expiryLengthSeconds = params.GetFailsafeTimerSeconds().ValueOr(kDefaultFailsafeTimeout);
         request.breadcrumb          = breadcrumb;
         request.timeoutMs           = kCommandTimeoutMs;
         ChipLogProgress(Controller, "Arming failsafe (%u seconds)", request.expiryLengthSeconds);
diff --git a/src/controller/CommissioningDelegate.h b/src/controller/CommissioningDelegate.h
index 08ab56f218bf25..db0fe09a21bfc0 100644
--- a/src/controller/CommissioningDelegate.h
+++ b/src/controller/CommissioningDelegate.h
@@ -67,16 +67,15 @@ struct NOCChainGenerationParameters
     ByteSpan nocsrElements;
     ByteSpan signature;
 };
-struct NOCerts
-{
-};
+
+constexpr uint16_t kDefaultFailsafeTimeout = 60;
 class CommissioningParameters
 {
 public:
-    static constexpr size_t kMaxThreadDatasetLen      = 254;
-    static constexpr size_t kMaxSsidLen               = 32;
-    static constexpr size_t kMaxCredentialsLen        = 64;
-    static constexpr uint16_t kDefaultFailsafeTimeout = 60;
+    static constexpr size_t kMaxThreadDatasetLen = 254;
+    static constexpr size_t kMaxSsidLen          = 32;
+    static constexpr size_t kMaxCredentialsLen   = 64;
+
     const Optional<uint16_t> GetFailsafeTimerSeconds() const { return mFailsafeTimerSeconds; }
     const Optional<ByteSpan> GetCSRNonce() const { return mCSRNonce; }
     const Optional<ByteSpan> GetAttestationNonce() const { return mAttestationNonce; }