diff --git a/branches/newMo/src/continuator/moTrueContinuator.h b/branches/newMo/src/continuator/moTrueContinuator.h
index 2e1792c33..97354daa7 100644
--- a/branches/newMo/src/continuator/moTrueContinuator.h
+++ b/branches/newMo/src/continuator/moTrueContinuator.h
@@ -31,12 +31,3 @@ public:
 };
 
 #endif
-
-
-// Local Variables:
-// coding: iso-8859-1
-// mode: C++
-// c-file-offsets: ((c . 0))
-// c-file-style: "Stroustrup"
-// fill-column: 80
-// End:
diff --git a/branches/newMo/src/eval/moFullEvalByCopy.h b/branches/newMo/src/eval/moFullEvalByCopy.h
index f1a1aaa03..be8af9b63 100644
--- a/branches/newMo/src/eval/moFullEvalByCopy.h
+++ b/branches/newMo/src/eval/moFullEvalByCopy.h
@@ -4,7 +4,6 @@
 #include <eoEvalFunc.h>
 #include <eval/moEval.h>
 
-
 /**
  * Evaluation by copy
  */
diff --git a/branches/newMo/src/explorer/moNeighborhoodExplorer.h b/branches/newMo/src/explorer/moNeighborhoodExplorer.h
index ef26b676e..836ea9653 100644
--- a/branches/newMo/src/explorer/moNeighborhoodExplorer.h
+++ b/branches/newMo/src/explorer/moNeighborhoodExplorer.h
@@ -6,6 +6,7 @@
 
 #include <neighborhood/moNeighborhood.h>
 #include <eval/moEval.h>
+#include <comparator/moNeighborComparator.h>
 
 /**
  * Explore the neighborhood
diff --git a/branches/newMo/src/neighborhood/moBackableNeighbor.h b/branches/newMo/src/neighborhood/moBackableNeighbor.h
index 4175fdac4..9f33af530 100644
--- a/branches/newMo/src/neighborhood/moBackableNeighbor.h
+++ b/branches/newMo/src/neighborhood/moBackableNeighbor.h
@@ -1,6 +1,8 @@
 #ifndef _BackableNeighbor_h
 #define _BackableNeighbor_h
 
+#include <neighborhood/moNeighbor.h>
+
 /**
  * Neighbor with a move back function to use in a moFullEvalByModif
  */
diff --git a/branches/newMo/src/neighborhood/moBitNeighbor.h b/branches/newMo/src/neighborhood/moBitNeighbor.h
index bd0ee8f3a..c8f8f20a9 100644
--- a/branches/newMo/src/neighborhood/moBitNeighbor.h
+++ b/branches/newMo/src/neighborhood/moBitNeighbor.h
@@ -4,7 +4,6 @@
 #include <ga/eoBit.h>
 #include <neighborhood/moBackableNeighbor.h>
 
-
 /*
   contener of the neighbor information
 */
diff --git a/branches/newMo/src/neighborhood/moNeighbor.h b/branches/newMo/src/neighborhood/moNeighbor.h
index ff430d107..611c5830d 100644
--- a/branches/newMo/src/neighborhood/moNeighbor.h
+++ b/branches/newMo/src/neighborhood/moNeighbor.h
@@ -42,8 +42,6 @@
 #include <eoObject.h>
 #include <eoPersistent.h>
 
-#include <comparator/moNeighborComparator.h>
-
 /**
  * Container of the neighbor informations
  */
diff --git a/branches/newMo/src/neighborhood/moNeighborhood.h b/branches/newMo/src/neighborhood/moNeighborhood.h
index 1dd6fafc9..ef40114c3 100644
--- a/branches/newMo/src/neighborhood/moNeighborhood.h
+++ b/branches/newMo/src/neighborhood/moNeighborhood.h
@@ -3,7 +3,6 @@
 
 #include <eoObject.h>
 
-
 /**
  * A Neighborhood
  */
diff --git a/branches/newMo/tutorial/oneMax/application/testSimpleHC.cpp b/branches/newMo/tutorial/oneMax/application/testSimpleHC.cpp
index 8fa90ba76..51f3735df 100644
--- a/branches/newMo/tutorial/oneMax/application/testSimpleHC.cpp
+++ b/branches/newMo/tutorial/oneMax/application/testSimpleHC.cpp
@@ -24,37 +24,23 @@ using namespace std;
 //-----------------------------------------------------------------------------
 // fitness function
 #include <funcOneMax.h>
-
 #include <eoInt.h>
-
-#include <neighborhood/moEmptyNeighbor.h>
-
-#include <continuator/moTrueContinuator.h>
-
-// local search algorithm
-#include <algo/moLocalSearch.h>
-
-// the simple HC explorer
-#include <explorer/moSimpleHCexplorer.h>
-
-// explore the neighborhood of a bit string in order
 #include <neighborhood/moBitNeighborhood.h>
+#include <oneMaxBitNeighbor.h>
 
 #include <eval/moFullEvalByModif.h>
 #include <eval/moFullEvalByCopy.h>
-
-
-#include <oneMaxBitNeighbor.h>
-
 #include <comparator/moNeighborComparator.h>
+#include <continuator/moTrueContinuator.h>
+#include <algo/moLocalSearch.h>
+#include <explorer/moSimpleHCexplorer.h>
 
 // REPRESENTATION
 //-----------------------------------------------------------------------------
 // define your individuals
 typedef eoBit<unsigned> Indi;	
-//typedef OneMaxBitNeighbor<unsigned> Neighbor ; // incremental evaluation
-//typedef moFullEvalBitNeighbor<unsigned> Neighbor ; // full evaluation
-//typedef moBitNeighborhood<Neighbor> Neighborhood ;
+typedef moBitNeighbor<unsigned int> Neighbor ; // incremental evaluation
+typedef moBitNeighborhood<Neighbor> Neighborhood ;
 
 // GENERAL
 //-----------------------------------------------------------------------------
@@ -125,7 +111,7 @@ void main_function(int argc, char **argv)
 
   FuncOneMax<Indi> eval(vecSize);
 
-  moFullEvalByCopy<moBitNeighbor<unsigned int> > fulleval(eval);
+  moFullEvalByCopy<Neighbor > fulleval(eval);
 
   /* =========================================================
    *
@@ -152,9 +138,9 @@ void main_function(int argc, char **argv)
    *
    * ========================================================= */
   
-  moNeighborComparator<moBitNeighbor<unsigned int> > comparator;
+  moNeighborComparator<Neighbor > comparator;
 
-  moBitNeighborhood<moBitNeighbor<unsigned int> > neighborhood ;
+  Neighborhood neighborhood ;
 
   /* =========================================================
    *
@@ -162,7 +148,7 @@ void main_function(int argc, char **argv)
    *
    * ========================================================= */
   
-  moSimpleHCexplorer<moBitNeighborhood<moBitNeighbor<unsigned int> > > explorer(neighborhood, fulleval, comparator);
+  moSimpleHCexplorer<Neighborhood> explorer(neighborhood, fulleval, comparator);
 
   /* =========================================================
    *
@@ -170,9 +156,9 @@ void main_function(int argc, char **argv)
    *
    * ========================================================= */
 
-  moTrueContinuator<moBitNeighborhood<moBitNeighbor<unsigned int> > > continuator;
+  moTrueContinuator<Neighborhood> continuator;
 
-  moLocalSearch< moSimpleHCexplorer<moBitNeighborhood<moBitNeighbor<unsigned int> > >, moTrueContinuator<moBitNeighborhood<moBitNeighbor<unsigned int> > > > localSearch(explorer, continuator);
+  moLocalSearch< moSimpleHCexplorer<Neighborhood>, moTrueContinuator<Neighborhood> > localSearch(explorer, continuator);
 
   /* =========================================================
    *