diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp
index 804cde7f14..88cf26f8f9 100644
--- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp
+++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp
@@ -407,16 +407,18 @@ void TaskDlgPost::modifyStandardButtons(QDialogButtonBox* box)
 void TaskDlgPost::processCollapsedWidgets() {
 
     for (auto& widget : Content) {
-        if(auto task_box = dynamic_cast<Gui::TaskView::TaskBox*>(widget)) {
-            // get the task widget and check if it is a post widget
-            auto widget = task_box->groupLayout()->itemAt(0)->widget();
-            if(auto post_widget = dynamic_cast<TaskPostWidget*>(widget)) {
-                if(post_widget->initiallyCollapsed()) {
-                    post_widget->setGeometry(QRect(QPoint(0,0), post_widget->sizeHint()));
-                    task_box->hideGroupBox();
-                }
-            }
+        auto* task_box = dynamic_cast<Gui::TaskView::TaskBox*>(widget);
+        if (!task_box) {
+            continue;
         }
+        // get the task widget and check if it is a post widget
+        auto* taskwidget = task_box->groupLayout()->itemAt(0)->widget();
+        auto* post_widget = dynamic_cast<TaskPostWidget*>(taskwidget);
+        if (!post_widget || !post_widget->initiallyCollapsed()) {
+            continue;
+        }
+        post_widget->setGeometry(QRect(QPoint(0,0), post_widget->sizeHint()));
+        task_box->hideGroupBox();
     }
 }
 
diff --git a/src/Mod/Fem/Gui/TaskPostExtraction.cpp b/src/Mod/Fem/Gui/TaskPostExtraction.cpp
index abce2a30cf..4de2401c7c 100644
--- a/src/Mod/Fem/Gui/TaskPostExtraction.cpp
+++ b/src/Mod/Fem/Gui/TaskPostExtraction.cpp
@@ -82,17 +82,13 @@ TaskPostExtraction::TaskPostExtraction(ViewProviderFemPostObject* view, QWidget*
 
         Gui::PythonWrapper wrap;
         if (wrap.loadCoreModule()) {
-            QObject* object = wrap.toQObject(pywidget);
-            if (object) {
-                QWidget* widget = qobject_cast<QWidget*>(object);
-                if (widget) {
-                    // finally we have the usable QWidget. Add to us!
+            if (auto* widget = qobject_cast<QWidget*>(wrap.toQObject(pywidget))) {
+                // finally we have the usable QWidget. Add to us!
 
-                    auto layout = new QVBoxLayout();
-                    layout->addWidget(widget);
-                    setLayout(layout);
-                    return;
-                }
+                auto layout = new QVBoxLayout();
+                layout->addWidget(widget);
+                setLayout(layout);
+                return;
             }
         }
     }
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
index b3dcbf4c7b..9205e2d708 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
@@ -1023,12 +1023,12 @@ bool ViewProviderFemPostObject::setEdit(int ModNum)
 void ViewProviderFemPostObject::setupTaskDialog(TaskDlgPost* dlg)
 {
     assert(dlg->getView() == this);
-    auto disp_panel = new TaskPostDisplay(this);
-    dlg->addTaskBox(disp_panel->windowIcon().pixmap(32), disp_panel);
+    auto dispPanel = new TaskPostDisplay(this);
+    dlg->addTaskBox(dispPanel->windowIcon().pixmap(32), dispPanel);
 
 #ifdef FC_USE_VTK_PYTHON
-    auto extr_panel = new TaskPostExtraction(this);
-    dlg->addTaskBox(extr_panel->windowIcon().pixmap(32), extr_panel);
+    auto extrPanel = new TaskPostExtraction(this);
+    dlg->addTaskBox(extrPanel->windowIcon().pixmap(32), extrPanel);
 #endif
 }
 
diff --git a/src/Mod/Fem/femcommands/manager.py b/src/Mod/Fem/femcommands/manager.py
index 50fbae0548..f653d053a0 100644
--- a/src/Mod/Fem/femcommands/manager.py
+++ b/src/Mod/Fem/femcommands/manager.py
@@ -379,7 +379,7 @@ class CommandManager:
         # like add_obj_on_gui_selobj_noset_edit but the selection is kept
         # and the selobj is expanded in the tree to see the added obj
 
-        # check if we should use python fitler
+        # check if we should use python filter
         from femguiutils.vtk_module_handling import vtk_compatibility_abort
         if vtk_compatibility_abort(True):
             return