diff --git a/examples/rvc-app/rvc-common/include/rvc-service-area-delegate.h b/examples/rvc-app/rvc-common/include/rvc-service-area-delegate.h
index a2af6de88b0304..2f41131124c0ac 100644
--- a/examples/rvc-app/rvc-common/include/rvc-service-area-delegate.h
+++ b/examples/rvc-app/rvc-common/include/rvc-service-area-delegate.h
@@ -79,8 +79,8 @@ class RvcServiceAreaDelegate : public Delegate
     // command support
     bool IsSetSelectedAreasAllowed(MutableCharSpan & statusText) override;
 
-    bool IsValidSelectAreasSet(const Span<uint32_t> & selectedAreas,
-                               ServiceArea::SelectAreasStatus & areaStatus, MutableCharSpan & statusText) override;
+    bool IsValidSelectAreasSet(const Span<uint32_t> & selectedAreas, ServiceArea::SelectAreasStatus & areaStatus,
+                               MutableCharSpan & statusText) override;
 
     bool HandleSkipArea(uint32_t skippedArea, MutableCharSpan & skipStatusText) override;
 
diff --git a/src/app/clusters/service-area-server/service-area-server.cpp b/src/app/clusters/service-area-server/service-area-server.cpp
index 845d7f349b2a94..2aad5830a0dc07 100644
--- a/src/app/clusters/service-area-server/service-area-server.cpp
+++ b/src/app/clusters/service-area-server/service-area-server.cpp
@@ -241,24 +241,21 @@ void Instance::HandleSelectAreasCmd(HandlerContext & ctx, const Commands::Select
     }
 
     uint32_t selectedAreasBuffer[kMaxNumSelectedAreas];
-    auto selectedAreasSpan = Span<uint32_t>(selectedAreasBuffer, kMaxNumSelectedAreas);
+    auto selectedAreasSpan         = Span<uint32_t>(selectedAreasBuffer, kMaxNumSelectedAreas);
     uint32_t numberOfSelectedAreas = 0;
 
     // Closure for checking if an area ID exists in the selectedAreasSpan
-    auto areaAlreadyExists = [&numberOfSelectedAreas, &selectedAreasSpan] (uint32_t areaId)
-    {
+    auto areaAlreadyExists = [&numberOfSelectedAreas, &selectedAreasSpan](uint32_t areaId) {
         for (uint32_t i = 0; i < numberOfSelectedAreas; i++)
         {
             if (areaId == selectedAreasSpan[i])
             {
                 return true;
             }
-
         }
         return false;
     };
 
-
     // if number of selected locations in parameter matches number in attribute - the locations *might* be the same
     bool matchesCurrentSelectedAreas = (numberOfAreas == mDelegate->GetNumberOfSelectedAreas());