diff --git a/src/include/platform/ThreadStackManager.h b/src/include/platform/ThreadStackManager.h
index 7a69676a8deff2..f5aa72e273b721 100644
--- a/src/include/platform/ThreadStackManager.h
+++ b/src/include/platform/ThreadStackManager.h
@@ -351,7 +351,9 @@ inline CHIP_ERROR ThreadStackManager::SetThreadProvision(ByteSpan netInfo)
     return static_cast<ImplClass *>(this)->_SetThreadProvision(netInfo);
 }
 
-inline CHIP_ERROR ThreadStackManager::AttachToThreadNetwork(ByteSpan netInfo, NetworkCommissioning::Internal::WirelessDriver::ConnectCallback * callback)
+inline CHIP_ERROR
+ThreadStackManager::AttachToThreadNetwork(ByteSpan netInfo,
+                                          NetworkCommissioning::Internal::WirelessDriver::ConnectCallback * callback)
 {
     return static_cast<ImplClass *>(this)->_AttachToThreadNetwork(netInfo, callback);
 }
diff --git a/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp b/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp
index ee306ddfb10b17..064c856947bc9e 100644
--- a/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp
+++ b/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp
@@ -34,8 +34,8 @@ namespace chip {
 namespace DeviceLayer {
 namespace NetworkCommissioning {
 // NOTE: For ThreadDriver, we uses two network configs, one is mSavedNetwork, and another is mStagingNetwork, during init, it will
-// load the network config from thread persistent info, and loads it into both mSavedNetwork and mStagingNetwork. When updating the networks,
-// all changed are made on the staging network. When validated we can commit it and save it to the persisten info
+// load the network config from thread persistent info, and loads it into both mSavedNetwork and mStagingNetwork. When updating the
+// networks, all changed are made on the staging network. When validated we can commit it and save it to the persisten info
 
 CHIP_ERROR GenericThreadDriver::Init()
 {
diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
index 1022d1465f8f61..95af4cf7269e3b 100644
--- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
+++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
@@ -53,8 +53,8 @@
 #include <lib/support/FixedBufferAllocator.h>
 #include <lib/support/ThreadOperationalDataset.h>
 #include <lib/support/logging/CHIPLogging.h>
-#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h>
 #include <platform/OpenThread/GenericNetworkCommissioningThreadDriver.h>
+#include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h>
 #include <platform/OpenThread/OpenThreadUtils.h>
 #include <platform/ThreadStackManager.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
@@ -305,7 +305,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_GetThreadProvis
     }
 
     assert(Thread::kSizeOperationalDataset <= netInfo.size());
-    //memcpy(tlvs.mTlvs, netInfo.data(), netInfo.size());
+    // memcpy(tlvs.mTlvs, netInfo.data(), netInfo.size());
     netInfo = ByteSpan(datasetTlv.mTlvs, datasetTlv.mLength);
 
     return CHIP_NO_ERROR;
@@ -324,8 +324,8 @@ bool GenericThreadStackManagerImpl_OpenThread<ImplClass>::_IsThreadAttached(void
 }
 
 template <class ImplClass>
-CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_AttachToThreadNetwork(ByteSpan netInfo,
-                                              NetworkCommissioning::Internal::WirelessDriver::ConnectCallback * callback)
+CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_AttachToThreadNetwork(
+    ByteSpan netInfo, NetworkCommissioning::Internal::WirelessDriver::ConnectCallback * callback)
 {
     // There is another ongoing connect request, reject the new one.
     VerifyOrReturnError(mpConnectCallback == nullptr, CHIP_ERROR_INCORRECT_STATE);