diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7da4ba90185146d2394f49e3fddd5771f23c897e..28d9b2b1732737fea1d4f56b991e25194a385d05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,14 +7,10 @@ SET(PROJECT_NAME dynamic-graph-python)
 SET(PROJECT_DESCRIPTION "Dynamic graph library Python bindings")
 SET(PROJECT_URL "http://github.com/${PROJECT_NAMESPACE}/${PROJECT_NAME}")
 
-# Export CMake Target
 SET(PROJECT_USE_CMAKE_EXPORT TRUE)
-
-# Make sure that every header is generated in dynamic-graph
 SET(CUSTOM_HEADER_DIR "dynamic-graph/python")
-
-# Do not fail on warning
 SET(CXX_DISABLE_WERROR TRUE)
+SET(DOXYGEN_USE_MATHJAX YES)
 
 INCLUDE(cmake/base.cmake)
 INCLUDE(cmake/boost.cmake)
@@ -23,10 +19,6 @@ INCLUDE(cmake/python.cmake)
 INCLUDE(cmake/test.cmake)
 INCLUDE(cmake/sphinx.cmake)
 
-SET(DOXYGEN_USE_MATHJAX YES)
-
-SET(CUSTOM_HEADER_DIR "dynamic-graph/python")
-
 SET(PKG_CONFIG_ADDITIONAL_VARIABLES plugindir ${PKG_CONFIG_ADDITIONAL_VARIABLES})
 
 CMAKE_POLICY(SET CMP0048 OLD)
diff --git a/package.xml b/package.xml
index 42a8bac05e06ad75a079f3ff1a24d5bd438a15a2..f9db2fbdc90705a89df830133aae68deaf71faae 100644
--- a/package.xml
+++ b/package.xml
@@ -6,7 +6,7 @@
   </description>
   <maintainer email="ostasse@laas.fr">Olivier Stasse</maintainer>
   <license>BSD</license>
-  
+
   <url>http://github.com/stack-of-tasks/dynamic-graph-python</url>
   <author>Nicolas Mansard</author>
   <author>Olivier Stasse</author>
@@ -17,11 +17,11 @@
   <exec_depend>roscpp</exec_depend>
   <exec_depend>dynamic-graph</exec_depend>
 
-  <build_export_depend>roscpp</build_export_depend>    
-  <build_export_depend>dynamic-graph</build_export_depend>  
-  
+  <build_export_depend>roscpp</build_export_depend>
+  <build_export_depend>dynamic-graph</build_export_depend>
+
   <buildtool_depend>catkin</buildtool_depend>
 
   <doc_depend>doxygen</doc_depend>
-  
+
 </package>
diff --git a/unitTesting/CMakeLists.txt b/unitTesting/CMakeLists.txt
index 43c748005801dd6c26d00d63d35763431211376d..77371cc9ac36bea7cfdc2d3e6095b2c9e8ad6bd9 100644
--- a/unitTesting/CMakeLists.txt
+++ b/unitTesting/CMakeLists.txt
@@ -35,11 +35,8 @@ SET_TARGET_PROPERTIES(${LIBRARY_NAME}
   SOVERSION ${PROJECT_VERSION}
   INSTALL_RPATH ${DYNAMIC_GRAPH_PLUGINDIR})
 
-#add_dependencies(${LIBRARY_NAME} dynamic-graph)
 target_link_libraries(${LIBRARY_NAME} dynamic-graph::dynamic-graph)
 
-#PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph)
-
 ## Create its bindings
 ## This mimics DYNAMIC_GRAPH_PYTHON_MODULE(${LIBRARY_NAME} ${LIBRARY_NAME} "${LIBRARY_NAME}-wrap")