diff --git a/GeoModelRead/GeoModelRead/ReadGeoModel.h b/GeoModelRead/GeoModelRead/ReadGeoModel.h
index 07b55a8edc49cc4a6d321a3af28949f2b566c065..17bcef52366579557325f5a24f62a56a12be24a6 100644
--- a/GeoModelRead/GeoModelRead/ReadGeoModel.h
+++ b/GeoModelRead/GeoModelRead/ReadGeoModel.h
@@ -34,7 +34,7 @@ typedef GeoModelIO::ReadGeoModel Persistifier;
 // ****************************************************************
 
 
-
+// local includes
 #include "GeoModelDBManager/GMDBManager.h"
 #include "GeoModelKernel/GeoXF.h"
 
@@ -65,12 +65,12 @@ class GeoGraphNode;
 class GeoShapeSubtraction;
 class GeoBox;
 
-
+// namespaces
 using namespace GeoGenfun;
 using namespace GeoXF;
 
 
-
+// type definitions
 typedef const Function & TRANSFUNCTION;
 // containers for boolean shapes' information
 typedef std::tuple<unsigned int/*shape ID*/, GeoShape*, unsigned int/*opA ID*/, unsigned int/*opB ID*/> tuple_shapes_boolean_info;
@@ -105,8 +105,7 @@ private:
   
   std::string getEnvVar( std::string const & key ) const;
 
-	GeoPhysVol* buildGeoModelByCalls();
-	GeoPhysVol* buildGeoModelOneGo();
+	GeoPhysVol* buildGeoModelPrivate();
 
   GeoBox* buildDummyShape();
 
diff --git a/GeoModelRead/src/ReadGeoModel.cpp b/GeoModelRead/src/ReadGeoModel.cpp
index dc65e412d9a841392cf7529ec7bf2a560a73cff3..129c256efbc5839e9d23d996e17c9d0f74a53157 100644
--- a/GeoModelRead/src/ReadGeoModel.cpp
+++ b/GeoModelRead/src/ReadGeoModel.cpp
@@ -148,9 +148,10 @@ ReadGeoModel::ReadGeoModel(GMDBManager* db, unsigned long* progress) : m_deepDeb
 }
 
 ReadGeoModel::~ReadGeoModel() {
-	// TODO Auto-generated destructor stub
+  // FIXME: some cleaning...??
 }
 
+  
 std::string ReadGeoModel::getEnvVar( std::string const & key ) const
 {
     char * val = std::getenv( key.c_str() );
@@ -161,8 +162,7 @@ GeoPhysVol* ReadGeoModel::buildGeoModel()
 {
   if (m_deepDebug) std::cout << "ReadGeoModel::buildGeoModel()" << std::endl;
 
-	// return buildGeoModelByCalls();
-	GeoPhysVol* rootVolume = buildGeoModelOneGo();
+	GeoPhysVol* rootVolume = buildGeoModelPrivate();
 
   // warn the user if there are unknown/unhalded shapes
 	if (m_unknown_shapes.size() > 0) {
@@ -177,10 +177,8 @@ GeoPhysVol* ReadGeoModel::buildGeoModel()
 }
 
 
-GeoPhysVol* ReadGeoModel::buildGeoModelOneGo()
+GeoPhysVol* ReadGeoModel::buildGeoModelPrivate()
 {
-  if (m_deepDebug) std::cout << "ReadGeoModel::buildGeoModelOneGo()" << std::endl;
-
   // *** get all data from the DB ***
 
 	// get all GeoModel nodes from the DB