diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index baaef554bda440ede59200b0580e40326c36ca9d..f86873ae81ce979cd4b18b3402f5bb9127d36e54 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -88,10 +88,9 @@ void DesignerScene::setSelectionModel(QItemSelectionModel* model, FilterProperty
 
     if (model != m_selectionModel) {
 
-        if (m_selectionModel) {
+        if (m_selectionModel)
             disconnect(m_selectionModel, &QItemSelectionModel::selectionChanged, this,
                        &DesignerScene::onSessionSelectionChanged);
-        }
 
         m_selectionModel = model;
         m_proxy = proxy;
@@ -104,9 +103,8 @@ void DesignerScene::setSelectionModel(QItemSelectionModel* model, FilterProperty
 IView* DesignerScene::getViewForItem(SessionGraphicsItem* item)
 {
     auto it = m_ItemToView.find(item);
-    if (it != m_ItemToView.end()) {
+    if (it != m_ItemToView.end())
         return it.value();
-    }
     return nullptr;
 }
 
@@ -246,8 +244,6 @@ IView* DesignerScene::addViewForItem(SessionGraphicsItem* item)
             addItem(view);
             return view;
         }
-    } else {
-        // view for item exists
     }
     return view;
 }
@@ -263,13 +259,8 @@ void DesignerScene::deleteViews(const QModelIndex& viewIndex)
 {
     for (int i_row = 0; i_row < m_sampleModel->rowCount(viewIndex); ++i_row) {
         QModelIndex itemIndex = m_sampleModel->index(i_row, 0, viewIndex);
-
-        if (SessionItem* item = m_sampleModel->itemForIndex(itemIndex)) {
+        if (SessionItem* item = m_sampleModel->itemForIndex(itemIndex))
             removeItemViewFromScene(item);
-
-        } else {
-            // not a parameterized graphics item
-        }
         deleteViews(itemIndex);
     }
     removeItemViewFromScene(m_sampleModel->itemForIndex(viewIndex)); // deleting view itself
@@ -378,7 +369,8 @@ void DesignerScene::onEstablishedConnection(NodeEditorConnection* connection_ptr
         if (parentView->getInputPortIndex(connection->inputPort()) == 0) {
             parent->setCore(child);
             return;
-        } else if (parentView->getInputPortIndex(connection->inputPort()) == 1) {
+        }
+        if (parentView->getInputPortIndex(connection->inputPort()) == 1) {
             parent->setShell(child);
             return;
         }
@@ -411,9 +403,8 @@ void DesignerScene::removeConnections(IView* view)
 void DesignerScene::dragMoveEvent(QGraphicsSceneDragDropEvent* event)
 {
     const DesignerMimeData* mimeData = checkDragEvent(event);
-    if (isAcceptedByMultiLayer(mimeData, event)) {
+    if (isAcceptedByMultiLayer(mimeData, event))
         QGraphicsScene::dragMoveEvent(event);
-    }
 }
 
 //! Hadles drop event
@@ -484,9 +475,8 @@ const DesignerMimeData* DesignerScene::checkDragEvent(QGraphicsSceneDragDropEven
 
 void DesignerScene::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
 {
-    if (isLayerDragged()) {
+    if (isLayerDragged())
         invalidate(); // to redraw vertical dashed line which denotes where to drag the layer
-    }
     QGraphicsScene::mouseMoveEvent(event);
 }
 
@@ -524,19 +514,13 @@ bool DesignerScene::isAcceptedByMultiLayer(const DesignerMimeData* mimeData,
     //    }
 
     // layer can be inserted in MultiLayer
-    if (mimeData->getClassName() == "Layer" && isMultiLayerNearby(event)) {
-        return true;
-    }
-    return false;
+    return mimeData->getClassName() == "Layer" && isMultiLayerNearby(event);
 }
 
 bool DesignerScene::isLayerDragged() const
 {
     ILayerView* layer = dynamic_cast<ILayerView*>(mouseGrabberItem());
-    if (layer && !m_layer_interface_line.isNull()) {
-        return true;
-    }
-    return false;
+    return layer && !m_layer_interface_line.isNull();
 }
 
 void DesignerScene::onSmartAlign()