diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e89e5f1ac9cf0aa324788bd50a803eb1a33c673..b2d37d37685bef61e1d3478e941593df4a675be8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,18 +78,14 @@ ENDIF()
 
 option(_WOLF_TRACE "Enable wolf tracing macro" ON)
 
-# Does this has any other interest
-# but for the examples ?
-# yes, for the tests !
-IF(BUILD_EXAMPLES OR BUILD_TESTS)
-  string(TOUPPER ${PROJECT_NAME} UPPER_NAME)
-  set(_WOLF_ROOT_DIR ${CMAKE_SOURCE_DIR})
-ENDIF(BUILD_EXAMPLES OR BUILD_TESTS)
-
-#find dependencies.
+# ============ DEPENDENCIES  ============
 FIND_PACKAGE(wolfcore REQUIRED)
 FIND_PACKAGE(wolfimu REQUIRED)
 
+# ============ CONFIG.H ============ 
+string(TOUPPER ${PROJECT_NAME} UPPER_NAME)
+set(_WOLF_ROOT_DIR ${CMAKE_SOURCE_DIR})
+
 # Define the directory where will be the configured config.h
 SET(WOLF_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/${PROJECT_NAME}/internal)
 
@@ -106,12 +102,11 @@ ENDIF()
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/internal/config.h.in "${WOLF_CONFIG_DIR}/config.h")
 include_directories("${PROJECT_BINARY_DIR}/conf")
 
-#INCLUDES SECTION
-# ==============================
+# ============ INCLUDES ============ 
 INCLUDE_DIRECTORIES(${wolfimu_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(BEFORE "include")
 
-#HEADERS
+# ============ HEADERS ============ 
 SET(HDRS_MATH
 include/bodydynamics/math/force_torque_delta_tools.h
   )
@@ -143,7 +138,7 @@ include/bodydynamics/sensor/sensor_inertial_kinematics.h
 include/bodydynamics/sensor/sensor_point_feet_nomove.h
   )
 
-#SOURCES
+# ============ SOURCES ============ 
 SET(SRCS_CAPTURE
 src/capture/capture_force_torque_preint.cpp
 src/capture/capture_inertial_kinematics.cpp