diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.cpp
index f348e5319b054dbcbd0e2420f53a85c754a6b986..77d36f0eeb590b5c16c8a7bebc5e394eb0fe3ef5 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeColorByHeightFilter.cpp
@@ -44,11 +44,11 @@ void VtkCompositeColorByHeightFilter::init()
     else
         heightFilter->SetInputConnection(_inputAlgorithm->GetOutputPort());
 
-    DataHolderLib::Color a = { 0, 0, 255, 255 }; // blue
-    DataHolderLib::Color b = { 0, 255, 0, 255 }; // green
-    DataHolderLib::Color c = { 255, 255, 0, 255 }; // yellow
-    DataHolderLib::Color d = { 155, 100, 50, 255 }; // brown
-    DataHolderLib::Color e = { 255, 0, 0, 255 }; // red
+    DataHolderLib::Color a{{0, 0, 255, 255}};    // blue
+    DataHolderLib::Color b{{0, 255, 0, 255}};    // green
+    DataHolderLib::Color c{{255, 255, 0, 255}};  // yellow
+    DataHolderLib::Color d{{155, 100, 50, 255}}; // brown
+    DataHolderLib::Color e{{255, 0, 0, 255}};    // red
     VtkColorLookupTable* ColorLookupTable = heightFilter->GetColorLookupTable();
     ColorLookupTable->setInterpolationType(DataHolderLib::LUTType::LINEAR);
     ColorLookupTable->setColor(-50, a);
diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp
index 1d7aacfa680ebb8558e20b7fdc2e3f3176396920..0fbb74d53208f7a5fbc2ccb8b1115f28ff1e3aad 100644
--- a/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp
+++ b/Applications/DataExplorer/VtkVis/VtkCompositeElementSelectionFilter.cpp
@@ -94,10 +94,10 @@ VtkColorLookupTable* VtkCompositeElementSelectionFilter::GetLookupTable()
 {
     VtkColorLookupTable* lut = VtkColorLookupTable::New();
     lut->SetTableRange(0,1);
-    DataHolderLib::Color a = { 0, 0, 255, 255 }; // blue
-    DataHolderLib::Color b = { 0, 255, 0, 255 }; // green
-    DataHolderLib::Color c = { 255, 255, 0, 255 }; // yellow
-    DataHolderLib::Color d = { 255, 0, 0, 255 }; // red
+    DataHolderLib::Color a{{0, 0, 255, 255}};   // blue
+    DataHolderLib::Color b{{0, 255, 0, 255}};   // green
+    DataHolderLib::Color c{{255, 255, 0, 255}};  // yellow
+    DataHolderLib::Color d{{255, 0, 0, 255}};    // red
     lut->setColor(1.0, a);
     lut->setColor(0.5, b);
     lut->setColor(0.25, c);
diff --git a/Applications/DataHolderLib/ColorLookupTable.cpp b/Applications/DataHolderLib/ColorLookupTable.cpp
index 8508a24c35a500271ef3e16e36dde3341b692dc0..5fd5ad00cfe43f0b65546bdfee6f262be84760c8 100644
--- a/Applications/DataHolderLib/ColorLookupTable.cpp
+++ b/Applications/DataHolderLib/ColorLookupTable.cpp
@@ -13,10 +13,12 @@
 
 namespace DataHolderLib
 {
-
 ColorLookupTable::ColorLookupTable()
-: _range(std::make_pair<double, double>(std::numeric_limits<double>::lowest(), std::numeric_limits<double>::max())),
-  _type(DataHolderLib::LUTType::LINEAR)
+    : _type(DataHolderLib::LUTType::LINEAR),
+      _range(
+          std::make_pair<double, double>(std::numeric_limits<double>::lowest(),
+                                         std::numeric_limits<double>::max()))
+
 {}
 
 void ColorLookupTable::setTableRange(double min, double max)