diff --git a/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.cpp b/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.cpp
index 286879b5f435a49602b70076b8a8456d37c66d27..84efcbcca26c05913e2ad8b1b71420f7ad0ae70e 100644
--- a/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.cpp
+++ b/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.cpp
@@ -90,9 +90,10 @@ namespace armarx::armem::vision::laser_scans::client
         memoryReader.setReadingMemory(result.proxy);
     }
 
-     armarx::armem::client::query::Builder Reader::buildQuery(const Query& query) const
+    armarx::armem::client::query::Builder
+    Reader::buildQuery(const Query& query) const
     {
-         armarx::armem::client::query::Builder qb;
+        armarx::armem::client::query::Builder qb;
 
         ARMARX_INFO << "Query for agent: " << query.agent
                     << " memory name: " << properties.memoryName;
@@ -132,15 +133,15 @@ namespace armarx::armem::vision::laser_scans::client
         }
 
         const auto convert =
-            [](const arondto::LaserScanStamped& aronLaserScanStamped,
-               const wm::EntityInstance& ei) -> LaserScanStamped
+            [](const arondto::LaserScanStamped & aronLaserScanStamped,
+               const wm::EntityInstance & ei) -> LaserScanStamped
         {
             LaserScanStamped laserScanStamped;
             fromAron(aronLaserScanStamped, laserScanStamped);
 
             const auto ndArrayNavigator =
-                aron::datanavigator::NDArrayNavigator::DynamicCast(
-                    ei.data()->getElement("scan"));
+            aron::datanavigator::NDArrayNavigator::DynamicCast(
+                ei.data()->getElement("scan"));
 
             ARMARX_CHECK_NOT_NULL(ndArrayNavigator);
 
@@ -202,8 +203,8 @@ namespace armarx::armem::vision::laser_scans::client
         // now create result from memory
         const auto& entities =
             qResult.memory.getCoreSegment(properties.memoryName)
-                .getProviderSegment(query.agent)
-                .entities();
+            .getProviderSegment(query.agent)
+            .entities();
 
         const auto laserScans = asLaserScans(entities);
         const auto sensors    = simox::alg::get_keys(entities);
diff --git a/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.h b/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.h
index f09e1e271827c1319112f3075d1f47866c238499..931fc1ef2fc5127c1cb6487ea01370dae5373e35 100644
--- a/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.h
+++ b/source/RobotAPI/libraries/armem_vision/client/laser_scans/Reader.h
@@ -59,7 +59,7 @@ namespace armarx::armem::vision::laser_scans::client
     */
     class Reader
     {
-      public:
+    public:
         Reader(armem::ClientReaderComponentPluginUser& memoryClient);
 
         virtual ~Reader();
@@ -96,9 +96,10 @@ namespace armarx::armem::vision::laser_scans::client
 
         void registerPropertyDefinitions(armarx::PropertyDefinitionsPtr& def);
 
-        armarx::armem::client::query::Builder buildQuery(const Query& query) const;
+        armarx::armem::client::query::Builder
+        buildQuery(const Query& query) const;
 
-      private:
+    private:
         armem::client::Reader memoryReader;
 
         // Properties
diff --git a/source/RobotAPI/libraries/armem_vision/client/laser_scans/Writer.h b/source/RobotAPI/libraries/armem_vision/client/laser_scans/Writer.h
index 34edeb55d2c4e69f191568b92ea6a190db98c2f2..6ae488dd50db037ab14ba5836ab7bbaaa4829b06 100644
--- a/source/RobotAPI/libraries/armem_vision/client/laser_scans/Writer.h
+++ b/source/RobotAPI/libraries/armem_vision/client/laser_scans/Writer.h
@@ -44,7 +44,7 @@ namespace armarx::armem::vision::laser_scans::client
     */
     class Writer
     {
-      public:
+    public:
         Writer(armem::ClientWriterComponentPluginUser& component);
         virtual ~Writer();
 
@@ -63,7 +63,7 @@ namespace armarx::armem::vision::laser_scans::client
                              const std::string& agentName,
                              const std::int64_t& timestamp);
 
-      private:
+    private:
         armem::client::Writer memoryWriter;
 
         // Properties
@@ -73,7 +73,6 @@ namespace armarx::armem::vision::laser_scans::client
             std::string coreSegmentName = "LaserScans";
         } properties;
 
-
         std::mutex memoryWriterMutex;
 
         const std::string propertyPrefix = "mem.vision.";