diff --git a/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/layout/StateModelLayoutMediator.cpp b/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/layout/StateModelLayoutMediator.cpp
index 7a890d1d24a9ecc2db7c19dad5ffa187bd76cb9e..635a8d268bfc908af991d2672333d84c2baa92d4 100644
--- a/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/layout/StateModelLayoutMediator.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartViewerPlugin/layout/StateModelLayoutMediator.cpp
@@ -159,15 +159,19 @@ void armarx::StateModelLayoutMediator::substateChanged(armarx::statechartmodel::
     switch (signalType)
     {
         case (statechartmodel::eAdded):
+        {
             addNode(substate);
             ARMARX_INFO_S << "new substate " << substate->getInstanceName();
             layoutAll = true;
-            break;
+        }
+        break;
 
         case (statechartmodel::eRemoved):
+        {
             ARMARX_INFO_S << "removed substate " << substate->getInstanceName();
             removeNode(substate);
-            break;
+        }
+        break;
 
         case (statechartmodel::eActivated):
         case (statechartmodel::eUnchanged):
@@ -175,6 +179,7 @@ void armarx::StateModelLayoutMediator::substateChanged(armarx::statechartmodel::
             return;
 
         case (statechartmodel::eChanged):
+        {
             //            ARMARX_INFO_S << substate->getInstanceName() << " changed ";
             //herausfinden ob Name geändert, ggf. Name im Graph ändern
             updateNodeName(substate);
@@ -186,9 +191,12 @@ void armarx::StateModelLayoutMediator::substateChanged(armarx::statechartmodel::
             //TODO: Muss noch irgendeine andere Änderung beachtet werden?
             //            ARMARX_INFO_S << "substate changed for" << substate->getInstanceName();
             ARMARX_INFO_S << "state changed " << substate->getInstanceName();
-            break;
+        }
+        break;
         default:
+        {
             ARMARX_WARNING << "CASE NOT HANDLED " << signalType;
+        }
     }
 
     emit scheduleMe(id, layoutAll);