diff --git a/src/Mod/Fem/App/FemPostFunction.h b/src/Mod/Fem/App/FemPostFunction.h
index 464bc1ad19..6b7141927c 100644
--- a/src/Mod/Fem/App/FemPostFunction.h
+++ b/src/Mod/Fem/App/FemPostFunction.h
@@ -81,7 +81,7 @@ protected:
 };
 
 
-////////////////////////////////////////////////////////////////////////////////////////////
+// ---------------------------------------------------------------------------
 
 class AppFemExport FemPostPlaneFunction : public FemPostFunction
 {
@@ -105,7 +105,7 @@ protected:
     vtkSmartPointer<vtkPlane> m_plane;
 };
 
-////////////////////////////////////////////////////////////////////////////////////////////
+// ---------------------------------------------------------------------------
 
 class AppFemExport FemPostSphereFunction : public FemPostFunction
 {
diff --git a/src/Mod/Fem/App/HypothesisPy.cpp b/src/Mod/Fem/App/HypothesisPy.cpp
index 877bf0c08a..78ba337756 100755
--- a/src/Mod/Fem/App/HypothesisPy.cpp
+++ b/src/Mod/Fem/App/HypothesisPy.cpp
@@ -80,7 +80,7 @@ HypothesisPy::~HypothesisPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 template<class T>
 void SMESH_HypothesisPy<T>::init_type(PyObject* module)
@@ -149,7 +149,7 @@ Py::Object SMESH_HypothesisPy<T>::getLibName(const Py::Tuple& args)
 }
 
 
-#if SMESH_VERSION_MAJOR < 7 //////////////////////////////////////////////////////////
+#if SMESH_VERSION_MAJOR < 7 // -----------------------------------------------
 template<class T>
 Py::Object SMESH_HypothesisPy<T>::setParameters(const Py::Tuple& args)
 {
@@ -192,7 +192,7 @@ Py::Object SMESH_HypothesisPy<T>::clearParameters(const Py::Tuple& args)
     hypothesis<SMESH_Hypothesis>()->ClearParameters();
     return Py::None();
 }
-#endif //////////////////////////////////////////////////////////////////////////
+#endif // --------------------------------------------------------------------
 
 template<class T>
 Py::Object SMESH_HypothesisPy<T>::setParametersByMesh(const Py::Tuple& args)
@@ -226,7 +226,7 @@ PyObject *SMESH_HypothesisPy<T>::PyMake(struct _typeobject * /*type*/, PyObject
     return new T(hypId, 1, mesh->getGenerator());
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_Arithmetic1DPy::init_type(PyObject* module)
 {
@@ -263,7 +263,7 @@ Py::Object StdMeshers_Arithmetic1DPy::getLength(const Py::Tuple& args)
         GetLength(start ? true : false));
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_AutomaticLengthPy::init_type(PyObject* module)
 {
@@ -329,7 +329,7 @@ Py::Object StdMeshers_AutomaticLengthPy::getLength(const Py::Tuple& args)
     }
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_NotConformAllowedPy::init_type(PyObject* module)
 {
@@ -347,7 +347,7 @@ StdMeshers_NotConformAllowedPy::~StdMeshers_NotConformAllowedPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_MaxLengthPy::init_type(PyObject* module)
 {
@@ -419,7 +419,7 @@ Py::Object StdMeshers_MaxLengthPy::getUsePreestimatedLength(const Py::Tuple& arg
     return Py::Boolean(hypothesis<StdMeshers_MaxLength>()->GetUsePreestimatedLength());
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_LocalLengthPy::init_type(PyObject* module)
 {
@@ -468,7 +468,7 @@ Py::Object StdMeshers_LocalLengthPy::getPrecision(const Py::Tuple& args)
     return Py::Float(hypothesis<StdMeshers_LocalLength>()->GetPrecision());
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_MaxElementAreaPy::init_type(PyObject* module)
 {
@@ -502,7 +502,7 @@ Py::Object StdMeshers_MaxElementAreaPy::getMaxArea(const Py::Tuple& args)
     return Py::Float(hypothesis<StdMeshers_MaxElementArea>()->GetMaxArea());
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_QuadranglePreferencePy::init_type(PyObject* module)
 {
@@ -520,7 +520,7 @@ StdMeshers_QuadranglePreferencePy::~StdMeshers_QuadranglePreferencePy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_Quadrangle_2DPy::init_type(PyObject* module)
 {
@@ -538,7 +538,7 @@ StdMeshers_Quadrangle_2DPy::~StdMeshers_Quadrangle_2DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_Regular_1DPy::init_type(PyObject* module)
 {
@@ -556,7 +556,7 @@ StdMeshers_Regular_1DPy::~StdMeshers_Regular_1DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_UseExisting_1DPy::init_type(PyObject* module)
 {
@@ -574,7 +574,7 @@ StdMeshers_UseExisting_1DPy::~StdMeshers_UseExisting_1DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_UseExisting_2DPy::init_type(PyObject* module)
 {
@@ -592,7 +592,7 @@ StdMeshers_UseExisting_2DPy::~StdMeshers_UseExisting_2DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_CompositeSegment_1DPy::init_type(PyObject* module)
 {
@@ -610,7 +610,7 @@ StdMeshers_CompositeSegment_1DPy::~StdMeshers_CompositeSegment_1DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_Deflection1DPy::init_type(PyObject* module)
 {
@@ -637,7 +637,7 @@ Py::Object StdMeshers_Deflection1DPy::setDeflection(const Py::Tuple& args)
     return Py::None();
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_Hexa_3DPy::init_type(PyObject* module)
 {
@@ -655,9 +655,9 @@ StdMeshers_Hexa_3DPy::~StdMeshers_Hexa_3DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
-#if SMESH_VERSION_MAJOR < 7 ///////////////////////////////////////////////////////////
+#if SMESH_VERSION_MAJOR < 7 // -----------------------------------------------
 void StdMeshers_TrianglePreferencePy::init_type(PyObject* module)
 {
     behaviors().name("StdMeshers_TrianglePreference");
@@ -673,9 +673,9 @@ StdMeshers_TrianglePreferencePy::StdMeshers_TrianglePreferencePy(int hypId, int
 StdMeshers_TrianglePreferencePy::~StdMeshers_TrianglePreferencePy()
 {
 }
-#endif ///////////////////////////////////////////////////////////////////////////
+#endif // --------------------------------------------------------------------
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_StartEndLengthPy::init_type(PyObject* module)
 {
@@ -706,7 +706,7 @@ Py::Object StdMeshers_StartEndLengthPy::getLength(const Py::Tuple& args)
     return Py::Float(hypothesis<StdMeshers_StartEndLength>()->GetLength((bool)Py::Boolean(args[0])));
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_SegmentLengthAroundVertexPy::init_type(PyObject* module)
 {
@@ -739,7 +739,7 @@ Py::Object StdMeshers_SegmentLengthAroundVertexPy::getLength(const Py::Tuple& ar
     return Py::Float(hypothesis<StdMeshers_SegmentLengthAroundVertex>()->GetLength());
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_SegmentAroundVertex_0DPy::init_type(PyObject* module)
 {
@@ -757,7 +757,7 @@ StdMeshers_SegmentAroundVertex_0DPy::~StdMeshers_SegmentAroundVertex_0DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_RadialPrism_3DPy::init_type(PyObject* module)
 {
@@ -775,7 +775,7 @@ StdMeshers_RadialPrism_3DPy::~StdMeshers_RadialPrism_3DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_QuadraticMeshPy::init_type(PyObject* module)
 {
@@ -793,7 +793,7 @@ StdMeshers_QuadraticMeshPy::~StdMeshers_QuadraticMeshPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_ProjectionSource3DPy::init_type(PyObject* module)
 {
@@ -811,7 +811,7 @@ StdMeshers_ProjectionSource3DPy::~StdMeshers_ProjectionSource3DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_ProjectionSource2DPy::init_type(PyObject* module)
 {
@@ -829,7 +829,7 @@ StdMeshers_ProjectionSource2DPy::~StdMeshers_ProjectionSource2DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_ProjectionSource1DPy::init_type(PyObject* module)
 {
@@ -847,7 +847,7 @@ StdMeshers_ProjectionSource1DPy::~StdMeshers_ProjectionSource1DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_Projection_3DPy::init_type(PyObject* module)
 {
@@ -865,7 +865,7 @@ StdMeshers_Projection_3DPy::~StdMeshers_Projection_3DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_Projection_2DPy::init_type(PyObject* module)
 {
@@ -883,7 +883,7 @@ StdMeshers_Projection_2DPy::~StdMeshers_Projection_2DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_Projection_1DPy::init_type(PyObject* module)
 {
@@ -901,7 +901,7 @@ StdMeshers_Projection_1DPy::~StdMeshers_Projection_1DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_Prism_3DPy::init_type(PyObject* module)
 {
@@ -919,7 +919,7 @@ StdMeshers_Prism_3DPy::~StdMeshers_Prism_3DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_NumberOfSegmentsPy::init_type(PyObject* module)
 {
@@ -956,7 +956,7 @@ Py::Object StdMeshers_NumberOfSegmentsPy::getNumSegm(const Py::Tuple& args)
     return Py::Long(hypothesis<StdMeshers_NumberOfSegments>()->GetNumberOfSegments());
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_NumberOfLayersPy::init_type(PyObject* module)
 {
@@ -993,7 +993,7 @@ Py::Object StdMeshers_NumberOfLayersPy::getNumLayers(const Py::Tuple& args)
     return Py::Long(hypothesis<StdMeshers_NumberOfLayers>()->GetNumberOfLayers());
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_MEFISTO_2DPy::init_type(PyObject* module)
 {
@@ -1011,7 +1011,7 @@ StdMeshers_MEFISTO_2DPy::~StdMeshers_MEFISTO_2DPy()
 {
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_MaxElementVolumePy::init_type(PyObject* module)
 {
@@ -1044,7 +1044,7 @@ Py::Object StdMeshers_MaxElementVolumePy::getMaxVolume(const Py::Tuple& args)
     return Py::Float(hypothesis<StdMeshers_MaxElementVolume>()->GetMaxVolume());
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_LengthFromEdgesPy::init_type(PyObject* module)
 {
@@ -1081,7 +1081,7 @@ Py::Object StdMeshers_LengthFromEdgesPy::getMode(const Py::Tuple& args)
     return Py::Long(hypothesis<StdMeshers_LengthFromEdges>()->GetMode());
 }
 
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 void StdMeshers_LayerDistributionPy::init_type(PyObject* module)
 {
diff --git a/src/Mod/Fem/App/HypothesisPy.h b/src/Mod/Fem/App/HypothesisPy.h
index 2949c1f0b9..724aca765b 100755
--- a/src/Mod/Fem/App/HypothesisPy.h
+++ b/src/Mod/Fem/App/HypothesisPy.h
@@ -222,7 +222,7 @@ public:
     StdMeshers_Hexa_3DPy(int hypId, int studyId, SMESH_Gen* gen);
     ~StdMeshers_Hexa_3DPy();
 };
-#if SMESH_VERSION_MAJOR < 7 ///////////////////////////////////////////////////////////////////////////////
+#if SMESH_VERSION_MAJOR < 7 // -----------------------------------------------
 class StdMeshers_TrianglePreferencePy : public SMESH_HypothesisPy<StdMeshers_TrianglePreferencePy>
 {
 public:
@@ -230,7 +230,7 @@ public:
     StdMeshers_TrianglePreferencePy(int hypId, int studyId, SMESH_Gen* gen);
     ~StdMeshers_TrianglePreferencePy();
 };
-#endif ///////////////////////////////////////////////////////////////////////////////////////////////
+#endif // --------------------------------------------------------------------
 
 class StdMeshers_StartEndLengthPy : public SMESH_HypothesisPy<StdMeshers_StartEndLengthPy>
 {
diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp
index 2cdfe4c527..aa1a801177 100644
--- a/src/Mod/Fem/Gui/Command.cpp
+++ b/src/Mod/Fem/Gui/Command.cpp
@@ -964,7 +964,7 @@ void DefineNodesCallback(void * ud, SoEventCallback * n)
     Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.addObject('Fem::FemSetNodesObject','NodeSet')");
     Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.ActiveObject.Nodes = %s",set.str().c_str());
     Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().%s.addObject(App.activeDocument().NodeSet)",Analysis->getNameInDocument());
-    ////Gui::Command::updateActive();
+    // Gui::Command::updateActive();
     Gui::Command::commitCommand();
 
     //std::vector<Gui::ViewProvider*> views = view->getViewProvidersOfType(ViewProviderMesh::getClassTypeId());
diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp
index f062ad772b..eb403958ce 100644
--- a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp
@@ -114,9 +114,9 @@ void ViewProviderFemAnalysis::setupContextMenu(QMenu* menu, QObject* , const cha
 bool ViewProviderFemAnalysis::setEdit(int ModNum)
 {
     if (ModNum == ViewProvider::Default ) {
-        //// When double-clicking on the item for this pad the
-        //// object unsets and sets its edit mode without closing
-        //// the task panel
+        // When double-clicking on the item for this pad the object
+        // unsets and sets its edit mode without closing the task panel
+
         //Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog();
         //TaskDlgAnalysis *anaDlg = qobject_cast<TaskDlgAnalysis *>(dlg);
         //if (padDlg && anaDlg->getPadView() != this)
@@ -162,7 +162,8 @@ void ViewProviderFemAnalysis::unsetEdit(int ModNum)
 
 bool ViewProviderFemAnalysis::onDelete(const std::vector<std::string> &)
 {
-    //// get the support and Sketch
+    // get the support and Sketch
+
     //PartDesign::Pad* pcPad = static_cast<PartDesign::Pad*>(getObject());
     //Sketcher::SketchObject *pcSketch = 0;
     //App::DocumentObject    *pcSupport = 0;
@@ -171,7 +172,8 @@ bool ViewProviderFemAnalysis::onDelete(const std::vector<std::string> &)
     //    pcSupport = pcSketch->Support.getValue();
     //}
 
-    //// if abort command deleted the object the support is visible again
+    // if abort command deleted the object the support is visible again
+
     //if (pcSketch && Gui::Application::Instance->getViewProvider(pcSketch))
     //    Gui::Application::Instance->getViewProvider(pcSketch)->show();
     //if (pcSupport && Gui::Application::Instance->getViewProvider(pcSupport))
diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp
index f4d24e51fb..59a4af00de 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp
@@ -109,7 +109,7 @@ void ViewProviderFemConstraintHeatflux::updateData(const App::Property* prop)
     float scaledradius = RADIUS * pcConstraint->Scale.getValue(); //OvG: Calculate scaled values once only
     float scaledheight = HEIGHT * pcConstraint->Scale.getValue();
     //float ambienttemp = pcConstraint->AmbientTemp.getValue();
-    ////float facetemp = pcConstraint->FaceTemp.getValue();
+    // //float facetemp = pcConstraint->FaceTemp.getValue();
     //float filmcoef = pcConstraint->FilmCoef.getValue();
 
     if (strcmp(prop->getName(),"Points") == 0) {