diff --git a/examples/thermostat/linux/thermostat-manager.cpp b/examples/thermostat/linux/thermostat-manager.cpp
index 526c38f9fb375c..00266161007d59 100644
--- a/examples/thermostat/linux/thermostat-manager.cpp
+++ b/examples/thermostat/linux/thermostat-manager.cpp
@@ -77,7 +77,8 @@ void OnAttributeChangeReported<MeasuredValue::TypeInfo::DecodableType>(const Con
     ClusterId clusterId = path.mClusterId;
     if (clusterId != TemperatureMeasurement::Id)
     {
-        ChipLogError(AppServer, "Attribute change reported for TemperatureMeasurement cluster on incorrect cluster id " ChipLogFormatMEI,
+        ChipLogError(AppServer,
+                     "Attribute change reported for TemperatureMeasurement cluster on incorrect cluster id " ChipLogFormatMEI,
                      ChipLogValueMEI(clusterId));
         return;
     }
@@ -85,7 +86,8 @@ void OnAttributeChangeReported<MeasuredValue::TypeInfo::DecodableType>(const Con
     AttributeId attributeId = path.mAttributeId;
     if (attributeId != MeasuredValue::Id)
     {
-        ChipLogError(AppServer, "Attribute change reported for TemperatureMeasurement cluster for incorrect attribute" ChipLogFormatMEI,
+        ChipLogError(AppServer,
+                     "Attribute change reported for TemperatureMeasurement cluster for incorrect attribute" ChipLogFormatMEI,
                      ChipLogValueMEI(attributeId));
         return;
     }
@@ -99,7 +101,9 @@ void OnAttributeChangeReported<MeasuredValue::TypeInfo::DecodableType>(const Con
 
 static void OnError(const ConcreteDataAttributePath * path, ChipError err)
 {
-    ChipLogError(AppServer, "Subscribing to cluster Id " ChipLogFormatMEI " and attribute Id " ChipLogFormatMEI " failed with error %" CHIP_ERROR_FORMAT,
+    ChipLogError(AppServer,
+                 "Subscribing to cluster Id " ChipLogFormatMEI " and attribute Id " ChipLogFormatMEI
+                 " failed with error %" CHIP_ERROR_FORMAT,
                  ChipLogValueMEI(path->mClusterId), ChipLogValueMEI(path->mAttributeId), err.Format());
 }
 
@@ -493,7 +497,8 @@ void MatterPostAttributeChangeCallback(const ConcreteAttributePath & attributePa
     ChipLogProgress(AppServer, "Cluster callback: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
 
     ChipLogProgress(AppServer,
-                    "Attribute ID changed: " ChipLogFormatMEI " Endpoint: %d ClusterId: " ChipLogFormatMEI " Type: %u Value: %u, length %u",
+                    "Attribute ID changed: " ChipLogFormatMEI " Endpoint: %d ClusterId: " ChipLogFormatMEI
+                    " Type: %u Value: %u, length %u",
                     ChipLogValueMEI(attributeId), attributePath.mEndpointId, ChipLogValueMEI(clusterId), type, *value, size);
 
     ThermostatMgr().AttributeChangeHandler(attributePath.mEndpointId, clusterId, attributeId, value, size);
diff --git a/src/app/clusters/thermostat-server/thermostat-server.cpp b/src/app/clusters/thermostat-server/thermostat-server.cpp
index 2aed5ab9bb0610..fe6cbb28e7d5d3 100644
--- a/src/app/clusters/thermostat-server/thermostat-server.cpp
+++ b/src/app/clusters/thermostat-server/thermostat-server.cpp
@@ -860,7 +860,7 @@ CHIP_ERROR ThermostatAttrAccess::Write(const ConcreteDataAttributePath & aPath,
         // Check if the OriginatorScopedNodeId at the endpoint is the same as the node editing the presets,
         // otherwise return BUSY.
         const Access::SubjectDescriptor subjectDescriptor = aDecoder.GetSubjectDescriptor();
-        ScopedNodeId scopedNodeId = ScopedNodeId();
+        ScopedNodeId scopedNodeId                         = ScopedNodeId();
 
         // Get the node id if the authentication mode is CASE.
         if (subjectDescriptor.authMode == Access::AuthMode::kCase)
@@ -946,8 +946,9 @@ void emberAfThermostatClusterServerInitCallback(chip::EndpointId endpoint)
     // or should this just be the responsibility of the thermostat application?
 }
 
-Protocols::InteractionModel::Status MatterThermostatClusterServerPreAttributeChangedCallback(const app::ConcreteAttributePath & attributePath,
-                                                                EmberAfAttributeType attributeType, uint16_t size, uint8_t * value)
+Protocols::InteractionModel::Status
+MatterThermostatClusterServerPreAttributeChangedCallback(const app::ConcreteAttributePath & attributePath,
+                                                         EmberAfAttributeType attributeType, uint16_t size, uint8_t * value)
 {
     EndpointId endpoint = attributePath.mEndpointId;
     int16_t requested;