diff --git a/src/Gui/ViewProvider.cpp b/src/Gui/ViewProvider.cpp
index 0c4147ce5df0..2241e87fd867 100644
--- a/src/Gui/ViewProvider.cpp
+++ b/src/Gui/ViewProvider.cpp
@@ -397,9 +397,8 @@ void ViewProvider::setModeSwitch()
 {
     if (viewOverrideMode == -1)
         pcModeSwitch->whichChild = _iActualMode;
-    else
-        if (viewOverrideMode < pcModeSwitch->getNumChildren())
-            pcModeSwitch->whichChild = viewOverrideMode;
+    else if (viewOverrideMode < pcModeSwitch->getNumChildren())
+        pcModeSwitch->whichChild = viewOverrideMode;
 }
 
 void ViewProvider::setDefaultMode(int val)
@@ -533,7 +532,7 @@ bool ViewProvider::mouseButtonPressed(int button, bool pressed,
     (void)cursorPos;
     (void)viewer;
     return false;
-    }
+}
 
 bool ViewProvider::onDelete(const vector< string >& subNames) {
     bool del = true;
@@ -547,9 +546,10 @@ bool ViewProvider::onDelete(const vector< string >& subNames) {
 bool ViewProvider::canDragObject(App::DocumentObject* obj) const {
 
     auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
-    for(Gui::ViewProviderExtension* ext : vector)
+    for(Gui::ViewProviderExtension* ext : vector) {
         if(ext->extensionCanDragObject(obj))
             return true;
+    }
 
     return false;
 }
@@ -557,9 +557,10 @@ bool ViewProvider::canDragObject(App::DocumentObject* obj) const {
 bool ViewProvider::canDragObjects() const {
 
     auto vector = getExtensionsDerivedFromType<Gui::ViewProviderExtension>();
-    for(Gui::ViewProviderExtension* ext : vector)
+    for(Gui::ViewProviderExtension* ext : vector) {
         if(ext->extensionCanDragObjects())
             return true;
+    }
 
     return false;
 }
@@ -574,7 +575,7 @@ void ViewProvider::dragObject(App::DocumentObject* obj) {
         }
     }
 
-    throw Base::Exception("ViewProvider::dragObject: no extension for draging given object available."); 
+    throw Base::Exception("ViewProvider::dragObject: no extension for dragging given object available.");
 }
 
 
@@ -615,7 +616,7 @@ void ViewProvider::dropObject(App::DocumentObject* obj) {
         }
     }
 
-    throw Base::Exception("ViewProvider::dropObject: no extension for droping given object available."); 
+    throw Base::Exception("ViewProvider::dropObject: no extension for dropping given object available.");
 }
 
 void ViewProvider::Restore(Base::XMLReader& reader) {
diff --git a/src/Gui/ViewProviderGroupExtension.cpp b/src/Gui/ViewProviderGroupExtension.cpp
index 03050117b5e8..317073a6cbcb 100644
--- a/src/Gui/ViewProviderGroupExtension.cpp
+++ b/src/Gui/ViewProviderGroupExtension.cpp
@@ -46,7 +46,6 @@ EXTENSION_PROPERTY_SOURCE(Gui::ViewProviderGroupExtension, Gui::ViewProviderExte
 ViewProviderGroupExtension::ViewProviderGroupExtension()  : visible(false)
 {
     initExtension(ViewProviderGroupExtension::getExtensionClassTypeId());
-    
 }
 
 ViewProviderGroupExtension::~ViewProviderGroupExtension()
@@ -77,7 +76,9 @@ bool ViewProviderGroupExtension::extensionCanDropObjects() const {
 
 bool ViewProviderGroupExtension::extensionCanDropObject(App::DocumentObject* obj) const {
 
-    Base::Console().Message("Check ViewProviderGroupExtension");
+#ifdef FC_DEBUG
+    Base::Console().Log("Check ViewProviderGroupExtension");
+#endif
 
     auto* group = getExtendedViewProvider()->getObject()->getExtensionByType<App::GroupExtension>();
 
@@ -86,12 +87,13 @@ bool ViewProviderGroupExtension::extensionCanDropObject(App::DocumentObject* obj
         return false;  
 
     //group into group?
-    if (obj->hasExtension(App::GroupExtension::getExtensionClassTypeId()))
-            if (group->isChildOf(obj->getExtensionByType<App::GroupExtension>()))
-                return false;
+    if (obj->hasExtension(App::GroupExtension::getExtensionClassTypeId())) {
+        if (group->isChildOf(obj->getExtensionByType<App::GroupExtension>()))
+            return false;
+    }
 
     //We need to find the correct App extension to ask if this is a supported type, there should only be one
-    if(group->allowObject(obj)) 
+    if (group->allowObject(obj))
         return true;
 
     return false;