diff --git a/CMakeLists.txt b/CMakeLists.txt
index 283da4078b98c0a53041c8ae70dbd0f93779f142..89e8ce8771d7987d3a40afbd1f7a78a6f8aecc7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,19 +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.
-# ============EXAMPLE==================
+# ============ DEPENDENCIES ============ 
 FIND_PACKAGE(wolfcore REQUIRED)
 FIND_PACKAGE(gnss_utils 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)
 
@@ -108,13 +103,12 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/internal/config.h.in "${WOLF_CONFIG_D
 message("CONFIG DIRECTORY ${PROJECT_BINARY_DIR}")
 include_directories("${PROJECT_BINARY_DIR}/conf")
 
-#INCLUDES SECTION
-# ==============================
+# ============ INCLUDES ============ 
 INCLUDE_DIRECTORIES(${wolfcore_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(${gnss_utils_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES(BEFORE "include")
 
-#HEADERS
+# ============ HEADERS ============ 
 SET(HDRS_CAPTURE
   include/gnss/capture/capture_gnss.h
   include/gnss/capture/capture_gnss_fix.h
@@ -146,7 +140,7 @@ SET(HDRS_TREE_MANAGER
   include/gnss/tree_manager/tree_manager_sliding_window_tdcp.h
   )
 
-#SOURCES
+# ============ SOURCES ============ 
 SET(SRCS_CAPTURE
   src/capture/capture_gnss.cpp
   src/capture/capture_gnss_fix.cpp