diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6ebabd2db..2c5e6661c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -399,8 +399,7 @@ list( APPEND grib_api_srcs
     grib_accessor_class_data_g2bifourier_packing.c
     eccodes_windef.h
     # We ship our own generated lex/yacc C files
-    grib_yacc.c  grib_lex.c
-)
+    grib_yacc.c  grib_lex.c )
 
 list( APPEND grib_api_extra_srcs
     grib_bits_fast_big_endian.c grib_bits_any_endian.c
@@ -410,8 +409,7 @@ list( APPEND grib_api_extra_srcs
     encode_double_array.c
     grib_bits_ibmpow.c
     grib_bits_ibmpow_opt.c
-    minmax_val.c
-)
+    minmax_val.c )
 
 configure_file( grib_api_version.c.in grib_api_version.c @ONLY )
 configure_file( eccodes_version.h.in eccodes_version.h @ONLY )
@@ -426,19 +424,19 @@ configure_file( eccodes_version.h.in eccodes_version.h @ONLY )
 #                    YACC_FLAGS  "-y"
 #                    DEPENDANT action.c )
 
-if(HAVE_MEMFS)
+if( HAVE_MEMFS )
     list(APPEND ECCODES_EXTRA_LIBRARIES eccodes_memfs)
 endif()
 
 
-ecbuild_add_library(TARGET    eccodes
-                    SOURCES   grib_api_version.c
+ecbuild_add_library( TARGET    eccodes
+                     SOURCES   grib_api_version.c
                               # griby.c gribl.c
                               ${grib_api_srcs}
-                    GENERATED grib_api_version.c
-                    LIBS      ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CMATH_LIBRARIES}
-                    TEMPLATES ${grib_api_extra_srcs}
-                    INSTALL_HEADERS_LIST
+                     GENERATED grib_api_version.c
+                     LIBS      ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CMATH_LIBRARIES}
+                     TEMPLATES ${grib_api_extra_srcs}
+                     INSTALL_HEADERS_LIST
                               grib_api.h
                               eccodes.h
                               eccodes_windef.h
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index d298c0239..634cbf8bf 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -12,8 +12,7 @@
 list( APPEND grib_tools_sources
              grib_tools.c
              grib_options.c
-             grib_tools.h
-             )
+             grib_tools.h )
 
 if( EC_OS_NAME MATCHES "windows" )
   list( APPEND grib_tools_sources wingetopt.c )
@@ -35,8 +34,7 @@ list( APPEND ecc_tools_binaries
              bufr_ls bufr_dump bufr_set bufr_get
              bufr_copy bufr_compare
              gts_get gts_compare gts_copy gts_dump gts_filter gts_ls
-             metar_dump metar_ls metar_compare metar_get metar_filter metar_copy
-             )
+             metar_dump metar_ls metar_compare metar_get metar_filter metar_copy )
 
 list( APPEND ecc_tools_binaries_extra
              big2gribex
@@ -44,8 +42,7 @@ list( APPEND ecc_tools_binaries_extra
              grib_repair
              grib_to_json
              grib_check_gaussian_grid
-             bufr_split_by_rdbSubtype
-             )
+             bufr_split_by_rdbSubtype )
 
 # Install generic tools
 foreach( tool ${ecc_tools_binaries} )
@@ -67,34 +64,34 @@ endforeach()
 # grib_count/bufr_count etc. Same source code, different executable names
 ecbuild_add_executable( TARGET     grib_count
                         SOURCES    codes_count.c
-                        LIBS       grib_tools  )
+                        LIBS       grib_tools )
 ecbuild_add_executable( TARGET     bufr_count
                         SOURCES    codes_count.c
-                        LIBS       grib_tools  )
+                        LIBS       grib_tools )
 ecbuild_add_executable( TARGET     gts_count
                         SOURCES    codes_count.c
-                        LIBS       grib_tools  )
+                        LIBS       grib_tools )
 
 # grib to netcdf is optional
 ecbuild_add_executable( TARGET     grib_to_netcdf
                         SOURCES    grib_to_netcdf.c
                         INCLUDES   ${NETCDF_INCLUDE_DIRS}
                         CONDITION  HAVE_NETCDF
-                        LIBS       grib_tools ${NETCDF_LIBRARIES})
+                        LIBS       grib_tools ${NETCDF_LIBRARIES} )
 
 
 ecbuild_add_executable( TARGET     grib_list_keys
                         SOURCES    list_keys.c
                         CONDITION  ECCODES_INSTALL_EXTRA_TOOLS
-                        LIBS       grib_tools  )
+                        LIBS       grib_tools )
 
 ecbuild_add_executable( TARGET     codes_bufr_filter
                         SOURCES    bufr_filter.c
-                        LIBS       grib_tools  )
+                        LIBS       grib_tools )
 
 
 # grib1to2 script needs to be generated before installation
-if (ECCODES_INSTALL_EXTRA_TOOLS)
+if( ECCODES_INSTALL_EXTRA_TOOLS )
     ecbuild_info("ECCODES_INSTALL_EXTRA_TOOLS enabled")
     configure_file( grib1to2.in  grib1to2 )
     install( FILES ${CMAKE_CURRENT_BINARY_DIR}/grib1to2