diff --git a/CMakeLists.txt b/CMakeLists.txt
index da4bc858893efb5c0d1096e017c5c44307092099..157d8e74d232c1bb092945c9cbbb9357f475b89f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(iri_base_driver)
 
-set(CMAKE_BUILD_TYPE "DEBUG")
+# set(CMAKE_BUILD_TYPE "DEBUG")
 
 ## Add support for C++11, supported in ROS Kinetic and newer
 # add_definitions(-std=c++11)
@@ -9,9 +9,14 @@ set(CMAKE_BUILD_TYPE "DEBUG")
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages
-find_package(catkin REQUIRED COMPONENTS roscpp dynamic_reconfigure message_generation)
+find_package(catkin REQUIRED COMPONENTS
+	roscpp
+	dynamic_reconfigure
+	message_generation
+)
 
 ## System dependencies are found with CMake's conventions
+# find_package(Boost REQUIRED COMPONENTS system)
 find_package(Boost REQUIRED COMPONENTS system thread)
 
 ## Uncomment this if the package has a setup.py. This macro ensures
@@ -92,17 +97,21 @@ catkin_package(
 ## Specify additional locations of header files
 ## Your package locations should be listed before other locations
 # include_directories(include)
-INCLUDE_DIRECTORIES(include)
-include_directories(${catkin_INCLUDE_DIRS})
-include_directories(${Boost_INCLUDE_DIRS})
+include_directories(
+  include
+  ${catkin_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIRS}
+)
 
 ## Declare a cpp library
 # add_library(foo
 #   src/${PROJECT_NAME}/foo.cpp
 # )
 add_library(${PROJECT_NAME} src/iri_base_driver.cpp)
-target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
-target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}
+  ${catkin_LIBRARIES}
+  ${Boost_LIBRARIES}
+)
 
 ## Declare a cpp executable
 # add_executable(foo_node src/foo_node.cpp)