diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c32bbc..47367d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,89 +3,55 @@ project(trajectory_preview)
 
 add_compile_options(-std=c++11)
 
-find_package(catkin REQUIRED COMPONENTS
-  rviz
-  sensor_msgs
-  trajectory_msgs
-)
+find_package(catkin REQUIRED COMPONENTS rviz sensor_msgs trajectory_msgs)
 
 find_package(Qt5 REQUIRED COMPONENTS Widgets)
 
 catkin_package(
   INCLUDE_DIRS
-    include
+  include
   LIBRARIES
-    ${PROJECT_NAME}_widget
-    ${PROJECT_NAME}_panel
+  ${PROJECT_NAME}_widget
+  ${PROJECT_NAME}_panel
   CATKIN_DEPENDS
-    rviz
-    sensor_msgs
-    trajectory_msgs
-)
+  rviz
+  sensor_msgs
+  trajectory_msgs)
 
-###########
-## Build ##
-###########
+# ######################################################################################################################
+# Build ##
+# ######################################################################################################################
 
-include_directories(
-  include
-  ${catkin_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_BINARY_DIR}
-)
+include_directories(include ${catkin_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
 
-qt5_wrap_ui(UI_MOC
-  ui/trajectory_preview_widget.ui
-)
+qt5_wrap_ui(UI_MOC ui/trajectory_preview_widget.ui)
 
-qt5_wrap_cpp(WIDGET_MOC
-  include/${PROJECT_NAME}/trajectory_preview_widget.h
-  src/trajectory_preview_impl.h
-)
+qt5_wrap_cpp(WIDGET_MOC include/${PROJECT_NAME}/trajectory_preview_widget.h src/trajectory_preview_impl.h)
 
-qt5_wrap_cpp(PANEL_MOC
-  include/${PROJECT_NAME}/trajectory_preview_panel.h
-)
+qt5_wrap_cpp(PANEL_MOC include/${PROJECT_NAME}/trajectory_preview_panel.h)
 
 # Widget Library
-add_library(${PROJECT_NAME}_widget
-  src/trajectory_preview_widget.cpp
-  ${UI_MOC}
-  ${WIDGET_MOC}
-)
-target_link_libraries(${PROJECT_NAME}_widget
-  ${catkin_LIBRARIES}
-  Qt5::Widgets
-)
+add_library(${PROJECT_NAME}_widget src/trajectory_preview_widget.cpp ${UI_MOC} ${WIDGET_MOC})
+target_link_libraries(${PROJECT_NAME}_widget ${catkin_LIBRARIES} Qt5::Widgets)
 
 # Panel Library
-add_library(${PROJECT_NAME}_panel
-  src/trajectory_preview_panel.cpp
-  ${PANEL_MOC}
-)
-target_link_libraries(${PROJECT_NAME}_panel
+add_library(${PROJECT_NAME}_panel src/trajectory_preview_panel.cpp ${PANEL_MOC})
+target_link_libraries(
+  ${PROJECT_NAME}_panel
   ${catkin_LIBRARIES}
   Qt5::Widgets
-  ${PROJECT_NAME}_widget
-)
+  ${PROJECT_NAME}_widget)
 
-#############
-## Install ##
-#############
+# ######################################################################################################################
+# Install ##
+# ######################################################################################################################
 
 install(
-  TARGETS
-    ${PROJECT_NAME}_widget
-    ${PROJECT_NAME}_panel
+  TARGETS ${PROJECT_NAME}_widget ${PROJECT_NAME}_panel
   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-  RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
-)
+  RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION})
 
-install(DIRECTORY include/${PROJECT_NAME}/
-  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-)
+install(DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
 
-install(FILES
-  plugin_description.xml
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
-)
+install(FILES plugin_description.xml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})