diff --git a/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp b/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
index 6b5415b837304e86c8ba81528817c14e75294bd3..c8659d536fcdf4a19b3b257b15162582407f8643 100644
--- a/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
+++ b/source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
@@ -182,7 +182,7 @@ namespace armarx
         removeSelectionCallbacks();
         selectionNode->deselectAll();
 
-        for (auto& e : selectedElements)
+        for (auto & e : selectedElements)
         {
             SoNode* n = SoSelection::getByName((SELECTION_NAME_PREFIX + e).c_str());
             if (n)
@@ -213,7 +213,7 @@ namespace armarx
                 name = name.substr(SELECTION_NAME_PREFIX.length());
 
                 // Check if selected element is 'selectable'
-                for (auto& layer : selectableLayers)
+                for (auto & layer : selectableLayers)
                 {
                     if (layers[layer].addedBoxVisualizations.find(name) != layers[layer].addedBoxVisualizations.end()
                         || layers[layer].addedTextVisualizations.find(name) != layers[layer].addedTextVisualizations.end()
@@ -1726,7 +1726,7 @@ namespace armarx
         d.layerName = layerName;
         d.name = robotName;
 
-        for (auto& it : configuration)
+        for (auto & it : configuration)
         {
             d.configuration[it.first] = it.second;
         }
@@ -1773,7 +1773,7 @@ namespace armarx
 
     void DebugDrawerComponent::clearAll(const Ice::Current&)
     {
-        for (auto& i : layers)
+        for (auto & i : layers)
         {
             clearLayer(i.first);
         }
@@ -1820,67 +1820,67 @@ namespace armarx
 
         Layer& layer = layers.at(layerName);
 
-        for (const auto& i : layer.addedCoordVisualizations)
+        for (const auto & i : layer.addedCoordVisualizations)
         {
             removePoseVisu(layerName, i.first);
         }
 
-        for (const auto& i : layer.addedLineVisualizations)
+        for (const auto & i : layer.addedLineVisualizations)
         {
             removeLineVisu(layerName, i.first);
         }
 
-        for (const auto& i : layer.addedLineSetVisualizations)
+        for (const auto & i : layer.addedLineSetVisualizations)
         {
             removeLineSetVisu(layerName, i.first);
         }
 
-        for (const auto& i : layer.addedBoxVisualizations)
+        for (const auto & i : layer.addedBoxVisualizations)
         {
             removeBoxVisu(layerName, i.first);
         }
 
-        for (const auto& i : layer.addedTextVisualizations)
+        for (const auto & i : layer.addedTextVisualizations)
         {
             removeTextVisu(layerName, i.first);
         }
 
-        for (const auto& i : layer.addedSphereVisualizations)
+        for (const auto & i : layer.addedSphereVisualizations)
         {
             removeSphereVisu(layerName, i.first);
         }
 
-        for (const auto& i : layer.addedCylinderVisualizations)
+        for (const auto & i : layer.addedCylinderVisualizations)
         {
             removeCylinderVisu(layerName, i.first);
         }
 
-        for (const auto& i : layer.addedPointCloudVisualizations)
+        for (const auto & i : layer.addedPointCloudVisualizations)
         {
             removePointCloudVisu(layerName, i.first);
         }
 
-        for (const auto& i : layer.addedPolygonVisualizations)
+        for (const auto & i : layer.addedPolygonVisualizations)
         {
             removePolygonVisu(layerName, i.first);
         }
 
-        for (const auto& i : layer.added24BitColoredPointCloudVisualizations)
+        for (const auto & i : layer.added24BitColoredPointCloudVisualizations)
         {
             remove24BitColoredPointCloudVisu(layerName, i.first);
         }
 
-        for (const auto& i : layer.addedArrowVisualizations)
+        for (const auto & i : layer.addedArrowVisualizations)
         {
             removeArrowVisu(layerName, i.first);
         }
 
-        for (const auto& i : layer.addedRobotVisualizations)
+        for (const auto & i : layer.addedRobotVisualizations)
         {
             removeRobotVisu(layerName, i.first);
         }
 
-        for (const auto& i : layer.addedCustomVisualizations)
+        for (const auto & i : layer.addedCustomVisualizations)
         {
             removeCustomVisu(layerName, i.first);
         }
@@ -2312,7 +2312,7 @@ namespace armarx
         ScopedRecursiveLockPtr l = getScopedVisuLock();
         StringSequence seq {};
 
-        for (const auto& layer : layers)
+        for (const auto & layer : layers)
         {
             seq.push_back(layer.first);
         }
@@ -2325,7 +2325,7 @@ namespace armarx
         ::armarx::LayerInformationSequence seq {};
         ScopedRecursiveLockPtr l = getScopedVisuLock();
 
-        for (const auto& layer : layers)
+        for (const auto & layer : layers)
         {
             int count = layer.second.addedCoordVisualizations.size() +
                         layer.second.addedLineVisualizations.size() +
@@ -2514,7 +2514,7 @@ namespace armarx
 
         pclSep->addChild(new SoPointSet);
 
-        ARMARX_INFO << d.name << "PointCloud Update " << pcl.size();
+        ARMARX_DEBUG << d.name << "PointCloud Update " << pcl.size();
 
         layer.added24BitColoredPointCloudVisualizations[d.name] = pclSep;
         layer.mainNode->addChild(pclSep);