diff --git a/FileIO/readMeshFromFile.cpp b/FileIO/readMeshFromFile.cpp
index 777862c1ab9bcf93d7c029a41eccee2aec7d68be..7c7f3e774c300d66cd27a4a8c182c6f5a48f6dfa 100644
--- a/FileIO/readMeshFromFile.cpp
+++ b/FileIO/readMeshFromFile.cpp
@@ -1,27 +1,32 @@
 /**
+ * @copyright
  * Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
  *              See accompanying file LICENSE.txt or
  *              http://www.opengeosys.org/project/license
  *
- *
- * \file readMeshFromFile.cpp
- *
- * Created on 2012-09-27 by Karsten Rink
+ * @file readMeshFromFile.cpp
+ * @date 2012-09-27
+ * @author Karsten Rink
  */
 
-#include "readMeshFromFile.h"
-#include "Mesh.h"
-#include "RapidXmlIO/RapidVtuInterface.h"
-#include "RapidXmlIO/BoostVtuInterface.h"
-#include "Legacy/MeshIO.h"
+// ThirdParty/logog
+#include "logog/include/logog.hpp"
 
 // BaseLib
-#include "StringTools.h"
 #include "FileTools.h"
+#include "StringTools.h"
+
+// MeshLib
+#include "Mesh.h"
 
-namespace FileIO {
+// FileIO
+#include "Legacy/MeshIO.h"
+#include "RapidXmlIO/BoostVtuInterface.h"
+#include "readMeshFromFile.h"
 
+namespace FileIO
+{
 MeshLib::Mesh* readMeshFromFile(const std::string &file_name)
 {
 	if (BaseLib::hasFileExtension("msh", file_name))
@@ -31,13 +36,9 @@ MeshLib::Mesh* readMeshFromFile(const std::string &file_name)
 	}
 
 	if (BaseLib::hasFileExtension("vtu", file_name))
-	{
-		//return FileIO::RapidVtuInterface::readVTUFile(file_name);
 		return FileIO::BoostVtuInterface::readVTUFile(file_name);
-	}
 
-	std::cout << "Unknown mesh file format" << std::endl;
+	ERR("readMeshFromFile(): Unknown mesh file format in file %s.", file_name.c_str());
 	return 0;
 }
-
-}
+} // end namespace FileIO
diff --git a/FileIO/readMeshFromFile.h b/FileIO/readMeshFromFile.h
index c44c4038daa703e4823f8687b04c64776fa349f1..dc35c001d284a30edac76ee1cd1d31ccf60b4ab7 100644
--- a/FileIO/readMeshFromFile.h
+++ b/FileIO/readMeshFromFile.h
@@ -5,9 +5,9 @@
  *              http://www.opengeosys.org/project/license
  *
  *
- * \file readMeshFromFile.h
- *
- * Created on 2012-09-27 by Karsten Rink
+ * @file readMeshFromFile.h
+ * @date 2012-09-27
+ * @author Karsten Rink
  */
 
 #ifndef READMESHFROMFILE_H
@@ -15,10 +15,14 @@
 
 #include <string>
 
-namespace MeshLib { class Mesh; }
+namespace MeshLib
+{
+class Mesh;
+}
 
-namespace FileIO {
-	MeshLib::Mesh* readMeshFromFile(const std::string &file_name);
+namespace FileIO
+{
+MeshLib::Mesh* readMeshFromFile(const std::string &file_name);
 }
 
-#endif // READMESHFROMFILE_H
\ No newline at end of file
+#endif // READMESHFROMFILE_H