diff --git a/Modules/Classification/CLUtilities/include/mitkCLResultWritter.h b/Modules/Classification/CLUtilities/include/mitkCLResultWritter.h
index 6f0ed1dd4a..3b52fae14f 100644
--- a/Modules/Classification/CLUtilities/include/mitkCLResultWritter.h
+++ b/Modules/Classification/CLUtilities/include/mitkCLResultWritter.h
@@ -1,39 +1,39 @@
 #ifndef mitkCLResultWritter_h
 #define mitkCLResultWritter_h
 
 #include "MitkCLUtilitiesExports.h"
 
 #include <sstream>
 #include <fstream>
 #include <vector>
 
 #include <mitkAbstractGlobalImageFeature.h>
 
 namespace mitk
 {
   namespace cl
   {
     class MITKCLUTILITIES_EXPORT FeatureResultWritter
     {
     public:
       FeatureResultWritter(std::string, int mode);
       ~FeatureResultWritter();
 
       void AddColumn(std::string value);
       void AddColumn(double value);
       void NewRow(std::string endName);
 
       void AddResult(std::string desc, int slice, mitk::AbstractGlobalImageFeature::FeatureListType stats, bool withHeader);
 
     private:
       int m_Mode;
       int m_CurrentRow;
       int m_CurrentElement;
       std::string m_Separator;
       std::ofstream m_Output;
       std::vector<std::string> m_List;
     };
   }
 }
 
-#endif mitkCLResultWritter_h
\ No newline at end of file
+#endif //mitkCLResultWritter_h
\ No newline at end of file
diff --git a/Modules/Classification/CLUtilities/src/mitkCLResultWritter.cpp b/Modules/Classification/CLUtilities/src/mitkCLResultWritter.cpp
index 1bca6cef36..248af2c22c 100644
--- a/Modules/Classification/CLUtilities/src/mitkCLResultWritter.cpp
+++ b/Modules/Classification/CLUtilities/src/mitkCLResultWritter.cpp
@@ -1,96 +1,96 @@
 #include <mitkCLResultWritter.h>
 
 mitk::cl::FeatureResultWritter::FeatureResultWritter(std::string file, int mode) :
     m_Mode(mode),
     m_CurrentRow(0),
     m_CurrentElement(0),
     m_Separator(";")
 {
   std::string str;
   m_List.push_back(str);
 
   m_Output.open(file, std::ios::app);
 }
 
 mitk::cl::FeatureResultWritter::~FeatureResultWritter()
 {
-  for (int i = 0; i < m_List.size(); ++i)
+  for (std::size_t i = 0; i < m_List.size(); ++i)
   {
     m_Output << m_List[i] << std::endl;
   }
   m_Output << "EndOfFile" << std::endl;
   m_Output.close();
 }
 
 
 void mitk::cl::FeatureResultWritter::AddColumn(double value) {
   std::ostringstream  ss;
   ss << value;
   AddColumn(ss.str());
 }
 
 void mitk::cl::FeatureResultWritter::AddColumn(std::string value) {
   if (m_Mode == 0)
   {
     m_List[m_CurrentRow] = m_List[m_CurrentRow] + value + m_Separator;
   }
   else
   {
     m_CurrentRow++;
     while (m_List.size() <= m_CurrentRow)
     {
       std::string str;
       m_List.push_back(str);
     }
     m_List[m_CurrentRow] = m_List[m_CurrentRow] + value + m_Separator;
   }
 }
 
 
 void mitk::cl::FeatureResultWritter::NewRow(std::string endName) {
   AddColumn(endName);
   if (m_Mode == 0)
   {
     m_CurrentRow++;
     while (m_List.size() <= m_CurrentRow)
     {
       std::string str;
       m_List.push_back(str);
     }
   }
   else
   {
     m_CurrentRow = 0;
   }
 }
 
 void mitk::cl::FeatureResultWritter::AddResult(std::string desc, int slice, mitk::AbstractGlobalImageFeature::FeatureListType stats, bool withHeader)
 {
   if ((withHeader) && (m_CurrentElement == 0))
   {
     AddColumn("Description");
     if (slice >= 0)
     {
       AddColumn("SliceNumber");
     }
     for (std::size_t i = 0; i < stats.size(); ++i)
     {
       AddColumn(stats[i].first);
     }
     NewRow("EndOfMeasurement");
   }
 
   AddColumn(desc);
   if (slice >= 0)
   {
     AddColumn(slice);
   }
   for (std::size_t i = 0; i < stats.size(); ++i)
   {
     AddColumn(stats[i].second);
   }
   NewRow("EndOfMeasurement");
   ++m_CurrentElement;
 }