diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h
index 53371ef3894a78..f5a4ddf281618a 100644
--- a/src/controller/CHIPDeviceController.h
+++ b/src/controller/CHIPDeviceController.h
@@ -565,10 +565,7 @@ class DLL_EXPORT DeviceCommissioner : public DeviceController,
      * @brief
      *  This function returns the current CommissioningStage for this commissioner.
      */
-    CommissioningStage GetCommissioningStage()
-    {
-        return mCommissioningStage;
-    }
+    CommissioningStage GetCommissioningStage() { return mCommissioningStage; }
 
 #if CONFIG_NETWORK_LAYER_BLE
 #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
diff --git a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
index c08182e038d560..97627b56c4ce1f 100644
--- a/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
+++ b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
@@ -63,18 +63,18 @@ public void setScanNetworksListener(ScanNetworksListener listener) {
   }
 
   /**
-   * Sets this DeviceController to use the given issuer for issuing operational certs and 
-   * verifying the DAC. By default, the DeviceController uses an internal, OperationalCredentialsDelegate 
-   * (see AndroidOperationalCredentialsIssuer).
+   * Sets this DeviceController to use the given issuer for issuing operational certs and verifying
+   * the DAC. By default, the DeviceController uses an internal, OperationalCredentialsDelegate (see
+   * AndroidOperationalCredentialsIssuer).
    *
-   * When a NOCChainIssuer is set for this controller, then onNOCChainGenerationNeeded will be
-   * called when the NOC CSR needs to be signed and DAC verified. This allows for custom credentials 
-   * issuer and DAC verifier implementations, for example, when a proprietary cloud API will perform 
+   * <p>When a NOCChainIssuer is set for this controller, then onNOCChainGenerationNeeded will be
+   * called when the NOC CSR needs to be signed and DAC verified. This allows for custom credentials
+   * issuer and DAC verifier implementations, for example, when a proprietary cloud API will perform
    * DAC verification and the CSR signing.
-   * 
-   * <p>When a NOCChainIssuer is set for this controller, the PartialDACVerifier will be used
-   * rather than the DefaultDACVerifier.
-   * 
+   *
+   * <p>When a NOCChainIssuer is set for this controller, the PartialDACVerifier will be used rather
+   * than the DefaultDACVerifier.
+   *
    * @param issuer
    */
   public void setNOCChainIssuer(NOCChainIssuer issuer) {
@@ -700,10 +700,10 @@ protected void finalize() throws Throwable {
   public interface NOCChainIssuer {
     /**
      * When a NOCChainIssuer is set for this controller, then onNOCChainGenerationNeeded will be
-     * called when the DAC chain must be verified and NOC chain needs to be issued from a CSR. This allows for custom credentials 
-     * issuer and DAC verifier implementations, for example, when a proprietary cloud API will perform 
-     * DAC verification and the NOC chain issuance from CSR.
-     * 
+     * called when the DAC chain must be verified and NOC chain needs to be issued from a CSR. This
+     * allows for custom credentials issuer and DAC verifier implementations, for example, when a
+     * proprietary cloud API will perform DAC verification and the NOC chain issuance from CSR.
+     *
      * <p>When a NOCChainIssuer is set for this controller, the PartialDACVerifier will be used
      * rather than the DefaultDACVerifier.
      *
@@ -728,10 +728,11 @@ public interface NOCChainIssuer {
    * <p>Set the AttemptNetworkScanWiFi or AttemptNetworkScanThread to configure the enable/disable
    * WiFi or Thread network scan during commissioning in the the default CommissioningDelegate used
    * by the ChipDeviceCommissioner.
-   * 
-   * When the callbacks onScanNetworksFailure or onScanNetworksSuccess are invoked, the commissioning
-   * flow has reached the kNeedsNetworkCreds and will wait to advance until this device controller's
-   * updateCommissioningNetworkCredentials method is called with the desired network credentials set.
+   *
+   * <p>When the callbacks onScanNetworksFailure or onScanNetworksSuccess are invoked, the
+   * commissioning flow has reached the kNeedsNetworkCreds and will wait to advance until this
+   * device controller's updateCommissioningNetworkCredentials method is called with the desired
+   * network credentials set.
    */
   public interface ScanNetworksListener {
     /** Notifies when scan networks call fails. */