diff --git a/eo/src/apply.h b/eo/src/apply.h
index 4c09e685..23a52245 100644
--- a/eo/src/apply.h
+++ b/eo/src/apply.h
@@ -3,7 +3,7 @@
 //-----------------------------------------------------------------------------
 // eoApply.h
 // (c) Maarten Keijzer 2000
-/* 
+/*
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
@@ -19,7 +19,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
     Contact: todos@geneura.ugr.es, http://geneura.ugr.es
-             mak@dhi.dk
+	     mak@dhi.dk
  */
 //-----------------------------------------------------------------------------
 
@@ -94,7 +94,7 @@ void omp_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
     //default(none) shared(_proc, _pop, size)
     for (size_t i = 0; i < size; ++i)
     {
-        _proc(_pop[i]);
+	_proc(_pop[i]);
     }
 }
 
@@ -112,7 +112,7 @@ void omp_dynamic_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
     //default(none) shared(_proc, _pop, size)
     for (size_t i = 0; i < size; ++i)
     {
-        _proc(_pop[i]);
+	_proc(_pop[i]);
     }
 }
 
diff --git a/eo/src/es/CMakeLists.txt b/eo/src/es/CMakeLists.txt
index e7b24901..9b052413 100644
--- a/eo/src/es/CMakeLists.txt
+++ b/eo/src/es/CMakeLists.txt
@@ -14,26 +14,29 @@ SET(CMA_LIB_OUTPUT_PATH ${EO_BINARY_DIR}/lib)
 
 SET(LIBRARY_OUTPUT_PATH ${ES_LIB_OUTPUT_PATH}) # the same output for the two libs
 
-SET (ES_SOURCES 	make_algo_scalar_es.cpp
-					make_algo_scalar_real.cpp 
-					make_checkpoint_es.cpp 
-					make_checkpoint_real.cpp 
-					make_continue_es.cpp 
-					make_continue_real.cpp 
-					make_genotype_es.cpp 
-					make_genotype_real.cpp 
-					make_op_es.cpp 
-					make_op_real.cpp 
-					make_pop_es.cpp 
-					make_pop_real.cpp 
-					make_run_es.cpp 
-					make_run_real.cpp)
-				
-SET (CMA_SOURCES 	eig.cpp
-					CMAState.cpp
-					CMAParams.cpp)
+SET(ES_SOURCES
+  make_algo_scalar_es.cpp
+  make_algo_scalar_real.cpp
+  make_checkpoint_es.cpp
+  make_checkpoint_real.cpp
+  make_continue_es.cpp
+  make_continue_real.cpp
+  make_genotype_es.cpp
+  make_genotype_real.cpp
+  make_op_es.cpp
+  make_op_real.cpp
+  make_pop_es.cpp
+  make_pop_real.cpp
+  make_run_es.cpp
+  make_run_real.cpp
+  )
+
+SET(CMA_SOURCES
+  eig.cpp
+  CMAState.cpp
+  CMAParams.cpp
+  )
 
- 
 ADD_LIBRARY(es STATIC ${ES_SOURCES})
 INSTALL(TARGETS es ARCHIVE DESTINATION lib COMPONENT libraries)
 
@@ -54,4 +57,3 @@ SET(CMA_VERSION ${GLOBAL_VERSION})
 SET_TARGET_PROPERTIES(cma PROPERTIES VERSION "${CMA_VERSION}")
 
 ######################################################################################
-
diff --git a/eo/src/ga/CMakeLists.txt b/eo/src/ga/CMakeLists.txt
index 7d048b6c..a463735c 100644
--- a/eo/src/ga/CMakeLists.txt
+++ b/eo/src/ga/CMakeLists.txt
@@ -12,14 +12,15 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 SET(GA_LIB_OUTPUT_PATH ${EO_BINARY_DIR}/lib)
 SET(LIBRARY_OUTPUT_PATH ${GA_LIB_OUTPUT_PATH})
 
-SET (GA_SOURCES 	make_algo_scalar_ga.cpp
-					make_checkpoint_ga.cpp
-					make_continue_ga.cpp
-					make_genotype_ga.cpp
-					make_op_ga.cpp
-					make_pop_ga.cpp
-					make_run_ga.cpp)
-
+SET(GA_SOURCES
+  make_algo_scalar_ga.cpp
+  make_checkpoint_ga.cpp
+  make_continue_ga.cpp
+  make_genotype_ga.cpp
+  make_op_ga.cpp
+  make_pop_ga.cpp
+  make_run_ga.cpp
+  )
 
 ADD_LIBRARY(ga STATIC ${GA_SOURCES})
 INSTALL(TARGETS ga ARCHIVE DESTINATION lib COMPONENT libraries)
@@ -35,4 +36,3 @@ SET(GA_VERSION ${GLOBAL_VERSION})
 SET_TARGET_PROPERTIES(ga PROPERTIES VERSION "${GA_VERSION}")
 
 ######################################################################################
-
diff --git a/eo/src/gp/CMakeLists.txt b/eo/src/gp/CMakeLists.txt
index c0ae8aff..44195d5f 100644
--- a/eo/src/gp/CMakeLists.txt
+++ b/eo/src/gp/CMakeLists.txt
@@ -1,3 +1,2 @@
 FILE(GLOB HDRS *.h)
 INSTALL(FILES ${HDRS} DESTINATION include/eo/gp COMPONENT headers)
-