diff --git a/yasmin/CMakeLists.txt b/yasmin/CMakeLists.txt
index f61fef4..eb42c00 100644
--- a/yasmin/CMakeLists.txt
+++ b/yasmin/CMakeLists.txt
@@ -5,6 +5,7 @@ project(yasmin)
 if(NOT CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 14)
 endif()
+
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   add_compile_options(-Wall -Wextra -Wpedantic)
 endif()
diff --git a/yasmin_demos/CMakeLists.txt b/yasmin_demos/CMakeLists.txt
index 3a678b1..2b24f8a 100644
--- a/yasmin_demos/CMakeLists.txt
+++ b/yasmin_demos/CMakeLists.txt
@@ -63,12 +63,7 @@ set(DEPENDENCIES
 )
 
 # demo
-add_executable(yasmin_demo
-  src/yasmin_demo.cpp
-)
-set(SOURCES
-  src/yasmin_demo.cpp
-)
+add_executable(yasmin_demo src/yasmin_demo.cpp)
 ament_target_dependencies(yasmin_demo ${DEPENDENCIES})
 install(TARGETS
   yasmin_demo
@@ -76,12 +71,7 @@ install(TARGETS
 )
 
 # monitor demo
-add_executable(monitor_demo
-  src/monitor_demo.cpp
-)
-set(SOURCES
-  src/monitor_demo.cpp
-)
+add_executable(monitor_demo src/monitor_demo.cpp)
 ament_target_dependencies(monitor_demo ${DEPENDENCIES})
 install(TARGETS
   monitor_demo
@@ -89,12 +79,7 @@ install(TARGETS
 )
 
 # service client demo
-add_executable(service_client_demo
-  src/service_client_demo.cpp
-)
-set(SOURCES
-  src/service_client_demo.cpp
-)
+add_executable(service_client_demo src/service_client_demo.cpp)
 ament_target_dependencies(service_client_demo ${DEPENDENCIES})
 install(TARGETS
   service_client_demo
@@ -102,12 +87,7 @@ install(TARGETS
 )
 
 # action client demo
-add_executable(action_client_demo
-  src/action_client_demo.cpp
-)
-set(SOURCES
-  src/action_client_demo.cpp
-)
+add_executable(action_client_demo src/action_client_demo.cpp)
 ament_target_dependencies(action_client_demo ${DEPENDENCIES})
 install(TARGETS
   action_client_demo
@@ -117,6 +97,7 @@ install(TARGETS
 ament_export_include_directories(include)
 ament_export_libraries(${LIB})
 
+
 # Python
 ament_python_install_package(${PROJECT_NAME})
 
diff --git a/yasmin_msgs/CMakeLists.txt b/yasmin_msgs/CMakeLists.txt
index cc8305d..e4ba0e8 100644
--- a/yasmin_msgs/CMakeLists.txt
+++ b/yasmin_msgs/CMakeLists.txt
@@ -1,11 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 project(yasmin_msgs)
 
-# Default to C99
-if(NOT CMAKE_C_STANDARD)
-  set(CMAKE_C_STANDARD 99)
-endif()
-
 # Default to C++14
 if(NOT CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD 14)
@@ -17,22 +12,6 @@ endif()
 
 # find dependencies
 find_package(ament_cmake REQUIRED)
-
-# uncomment the following section in order to fill in
-# further dependencies manually.
-# find_package(<dependency> REQUIRED)
-if(BUILD_TESTING)
-  find_package(ament_lint_auto REQUIRED)
-
-  # the following line skips the linter which checks for copyrights
-  # uncomment the line when a copyright and license is not present in all source files
-  # set(ament_cmake_copyright_FOUND TRUE)
-  # the following line skips cpplint (only works in a git repo)
-  # uncomment the line when this package is not in a git repo
-  # set(ament_cmake_cpplint_FOUND TRUE)
-  ament_lint_auto_find_test_dependencies()
-endif()
-
 find_package(rosidl_default_generators REQUIRED)
 
 rosidl_generate_interfaces(${PROJECT_NAME}
diff --git a/yasmin_ros/CMakeLists.txt b/yasmin_ros/CMakeLists.txt
index 772a926..4b07ad2 100644
--- a/yasmin_ros/CMakeLists.txt
+++ b/yasmin_ros/CMakeLists.txt
@@ -10,7 +10,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   add_compile_options(-Wall -Wextra -Wpedantic)
 endif()
 
-
 if(NOT DEFINED ENV{ROS_DISTRO})
   message(FATAL_ERROR "ROS_DISTRO is not defined." )
 endif()
@@ -64,7 +63,6 @@ set(DEPENDENCIES
 )
 
 add_library(${LIB} STATIC ${SOURCES})
-
 ament_target_dependencies(${LIB} ${DEPENDENCIES})
 
 install(TARGETS ${LIB}
@@ -81,6 +79,7 @@ ament_export_include_directories(include)
 ament_export_libraries(${LIB})
 ament_export_dependencies(${DEPENDENCIES})
 
+
 # Python
 ament_python_install_package(${PROJECT_NAME})