diff --git a/src/meshlab/ml_default_decorators.cpp b/src/meshlab/ml_default_decorators.cpp
index cf29b6e89..f967cb293 100644
--- a/src/meshlab/ml_default_decorators.cpp
+++ b/src/meshlab/ml_default_decorators.cpp
@@ -35,13 +35,12 @@ bool MLDefaultMeshDecorators::updateMeshDecorationData( MeshModel& mesh,const ML
     if ((!oldvalid) || (!currentvalid))
         return false;
 
-    if ((currentopts._peredge_edgeboundary_enabled && !oldopts._peredge_edgeboundary_enabled) || 
-        (currentopts._peredge_faceboundary_enabled && !oldopts._peredge_faceboundary_enabled))
-            initBoundaryDecoratorData(mesh,currentopts._peredge_edgeboundary_enabled,currentopts._peredge_faceboundary_enabled);
-    else 
-        if ((!currentopts._peredge_edgeboundary_enabled && oldopts._peredge_edgeboundary_enabled) || 
-            (!currentopts._peredge_faceboundary_enabled && oldopts._peredge_faceboundary_enabled))
-                cleanBoundaryDecoratorData(mesh,!currentopts._peredge_edgeboundary_enabled,!currentopts._peredge_faceboundary_enabled);
+    /*the boolean conditions should make the following code lines mutually exclusive.....hopefully*/ 
+    initBoundaryDecoratorData(mesh,currentopts._peredge_edgeboundary_enabled && !oldopts._peredge_edgeboundary_enabled,
+                                   currentopts._peredge_faceboundary_enabled && !oldopts._peredge_faceboundary_enabled);
+    cleanBoundaryDecoratorData(mesh,!currentopts._peredge_edgeboundary_enabled && oldopts._peredge_edgeboundary_enabled,
+                                    !currentopts._peredge_faceboundary_enabled && oldopts._peredge_faceboundary_enabled);
+
 
     if (currentopts._peredge_edgemanifold_enabled && !oldopts._peredge_edgemanifold_enabled)
         initNonManifEdgeDecoratorData(mesh);
@@ -58,8 +57,7 @@ bool MLDefaultMeshDecorators::initMeshDecorationData( MeshModel& m,const MLRende
     if (!valid)
         return false;
 
-    if (opts._peredge_edgeboundary_enabled || opts._peredge_faceboundary_enabled)
-        initBoundaryDecoratorData(m,opts._peredge_edgeboundary_enabled,opts._peredge_faceboundary_enabled);
+    initBoundaryDecoratorData(m,opts._peredge_edgeboundary_enabled,opts._peredge_faceboundary_enabled);
 
     if (opts._peredge_edgemanifold_enabled)
         initNonManifEdgeDecoratorData(m);
diff --git a/src/meshlab/ml_render_gui.cpp b/src/meshlab/ml_render_gui.cpp
index 2687f5858..c7bf9dba2 100644
--- a/src/meshlab/ml_render_gui.cpp
+++ b/src/meshlab/ml_render_gui.cpp
@@ -125,7 +125,6 @@ void MLRenderingToolbar::getCurrentRenderingDataAccordingToGUI( MLRenderingData&
     }
 }
 
-
 MLRenderingSideToolbar::MLRenderingSideToolbar(QWidget* parent /*= NULL*/ )
     :MLRenderingToolbar(parent)
 {
diff --git a/src/meshlab/ml_render_gui.h b/src/meshlab/ml_render_gui.h
index cd0c9d8dd..cedac68cb 100644
--- a/src/meshlab/ml_render_gui.h
+++ b/src/meshlab/ml_render_gui.h
@@ -129,6 +129,8 @@ protected slots:
     virtual void toggle(QAction* act);
     void extraUpdateRequired(int,MLRenderingAction*);
 
+//private:
+//    void initGui();
 
 signals:
     void updateRenderingDataAccordingToActions(int,const QList<MLRenderingAction*>& acts);
@@ -181,7 +183,7 @@ signals:
     void updateRenderingDataAccordingToAction(int,MLRenderingAction*);
 
 private slots:
-    void toggle(QAction* act);
+    void toggle(QAction*);
 };
 
 class MLRenderingParametersFrame : public QFrame