diff --git a/src/accessor/grib_accessor_class_bufr_extract_area_subsets.cc b/src/accessor/grib_accessor_class_bufr_extract_area_subsets.cc
index 6e747efec..b24f5c0cb 100644
--- a/src/accessor/grib_accessor_class_bufr_extract_area_subsets.cc
+++ b/src/accessor/grib_accessor_class_bufr_extract_area_subsets.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -18,7 +17,7 @@ void grib_accessor_bufr_extract_area_subsets_t::init(const long len, grib_argume
 {
     grib_accessor_gen_t::init(len, arg);
     grib_handle* h = grib_handle_of_accessor(this);
-    int n          = 0;
+    int n = 0;
 
     length_                       = 0;
     doExtractSubsets_             = grib_arguments_get_name(h, arg, n++);
@@ -50,10 +49,10 @@ static void fill_in(double a[], long length)
 
 int grib_accessor_bufr_extract_area_subsets_t::select_area()
 {
-    int ret                                         = 0;
-    long compressed                                 = 0;
-    grib_handle* h                                  = grib_handle_of_accessor(this);
-    grib_context* c                                 = h->context;
+    int ret         = 0;
+    long compressed = 0;
+    grib_handle* h  = grib_handle_of_accessor(this);
+    grib_context* c = h->context;
 
     double* lat = NULL;
     double* lon = NULL;
@@ -61,13 +60,9 @@ int grib_accessor_bufr_extract_area_subsets_t::select_area()
     double lonWest, lonEast, latNorth, latSouth;
     long numberOfSubsets, i, latRank, lonRank;
     grib_iarray* subsets = NULL;
-    size_t nsubsets      = 0;
-    char latstr[32]      = {
-        0,
-    };
-    char lonstr[32] = {
-        0,
-    };
+    size_t nsubsets = 0;
+    char latstr[32] = {0,};
+    char lonstr[32] = {0,};
 
     ret = grib_get_long(h, "compressedData", &compressed);
     if (ret) return ret;
diff --git a/src/accessor/grib_accessor_class_bufr_string_values.cc b/src/accessor/grib_accessor_class_bufr_string_values.cc
index 0530cec87..e95f43a59 100644
--- a/src/accessor/grib_accessor_class_bufr_string_values.cc
+++ b/src/accessor/grib_accessor_class_bufr_string_values.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -40,14 +39,13 @@ grib_accessor* grib_accessor_bufr_string_values_t::get_accessor()
 
 int grib_accessor_bufr_string_values_t::unpack_string_array(char** buffer, size_t* len)
 {
-    grib_accessor_bufr_data_array_t* data = 0;
-    grib_context* c                       = context_;
-    grib_vsarray* stringValues            = NULL;
-    size_t l                              = 0, tl;
+    grib_context* c = context_;
+    grib_vsarray* stringValues = NULL;
+    size_t l = 0, tl;
     size_t i, j, n = 0;
     char** b = buffer;
 
-    data = dynamic_cast<grib_accessor_bufr_data_array_t*>(get_accessor());
+    grib_accessor_bufr_data_array_t* data = dynamic_cast<grib_accessor_bufr_data_array_t*>(get_accessor());
     if (!data)
         return GRIB_NOT_FOUND;
 
diff --git a/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc b/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc
index 0d36208d1..1b769121a 100644
--- a/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc
+++ b/src/accessor/grib_accessor_class_bufrdc_expanded_descriptors.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -67,9 +66,7 @@ int grib_accessor_bufrdc_expanded_descriptors_t::unpack_string_array(char** buff
     long lenall                = 0;
     size_t i                   = 0;
     long* v                    = 0;
-    char buf[25]               = {
-        0,
-    };
+    char buf[25]               = {0,};
     grib_context* c = context_;
 
     descriptors = get_accessor();
diff --git a/src/accessor/grib_accessor_class_codeflag.cc b/src/accessor/grib_accessor_class_codeflag.cc
index 6921c5b17..07435e6c4 100644
--- a/src/accessor/grib_accessor_class_codeflag.cc
+++ b/src/accessor/grib_accessor_class_codeflag.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -105,12 +104,8 @@ int grib_accessor_codeflag_t::value_count(long* count)
 void grib_accessor_codeflag_t::dump(grib_dumper* dumper)
 {
     long v              = 0;
-    char flagname[1024] = {
-        0,
-    };
-    char fname[1024] = {
-        0,
-    };
+    char flagname[1024] = {0,};
+    char fname[1024] = {0,};
 
     size_t llen = 1;
 
diff --git a/src/accessor/grib_accessor_class_concept.cc b/src/accessor/grib_accessor_class_concept.cc
index 532db4f26..bcfdbecac 100644
--- a/src/accessor/grib_accessor_class_concept.cc
+++ b/src/accessor/grib_accessor_class_concept.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -298,9 +297,7 @@ static int grib_concept_apply(grib_accessor* a, const char* name)
         if (err) {
             size_t i = 0, concept_count = 0;
             long dummy = 0, editionNumber = 0;
-            char centre_s[32] = {
-                0,
-            };
+            char centre_s[32] = {0,};
             size_t centre_len                              = sizeof(centre_s);
             char* all_concept_vals[MAX_NUM_CONCEPT_VALUES] = {
                 NULL,
diff --git a/src/accessor/grib_accessor_class_count_file.cc b/src/accessor/grib_accessor_class_count_file.cc
index 36331c3d9..16f65c300 100644
--- a/src/accessor/grib_accessor_class_count_file.cc
+++ b/src/accessor/grib_accessor_class_count_file.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_count_missing.cc b/src/accessor/grib_accessor_class_count_missing.cc
index b4b841c5f..372f6540d 100644
--- a/src/accessor/grib_accessor_class_count_missing.cc
+++ b/src/accessor/grib_accessor_class_count_missing.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_count_total.cc b/src/accessor/grib_accessor_class_count_total.cc
index bc6af55c5..432930686 100644
--- a/src/accessor/grib_accessor_class_count_total.cc
+++ b/src/accessor/grib_accessor_class_count_total.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_data_apply_bitmap.cc b/src/accessor/grib_accessor_class_data_apply_bitmap.cc
index ec43d810f..72a5cc148 100644
--- a/src/accessor/grib_accessor_class_data_apply_bitmap.cc
+++ b/src/accessor/grib_accessor_class_data_apply_bitmap.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_data_apply_boustrophedonic.cc b/src/accessor/grib_accessor_class_data_apply_boustrophedonic.cc
index b453bc7c9..a711969f4 100644
--- a/src/accessor/grib_accessor_class_data_apply_boustrophedonic.cc
+++ b/src/accessor/grib_accessor_class_data_apply_boustrophedonic.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_data_ccsds_packing.cc b/src/accessor/grib_accessor_class_data_ccsds_packing.cc
index de30c0545..99fbd2dc3 100644
--- a/src/accessor/grib_accessor_class_data_ccsds_packing.cc
+++ b/src/accessor/grib_accessor_class_data_ccsds_packing.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_data_complex_packing.cc b/src/accessor/grib_accessor_class_data_complex_packing.cc
index 57871fdf0..1b33fef30 100644
--- a/src/accessor/grib_accessor_class_data_complex_packing.cc
+++ b/src/accessor/grib_accessor_class_data_complex_packing.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.cc b/src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.cc
index 09922a2f6..2ee15e425 100644
--- a/src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.cc
+++ b/src/accessor/grib_accessor_class_data_g1second_order_general_extended_packing.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_data_simple_packing.cc b/src/accessor/grib_accessor_class_data_simple_packing.cc
index cf9e10ad8..ca830a9d2 100644
--- a/src/accessor/grib_accessor_class_data_simple_packing.cc
+++ b/src/accessor/grib_accessor_class_data_simple_packing.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
diff --git a/src/accessor/grib_accessor_class_statistics_spectral.cc b/src/accessor/grib_accessor_class_statistics_spectral.cc
index 61902529d..033dfb692 100644
--- a/src/accessor/grib_accessor_class_statistics_spectral.cc
+++ b/src/accessor/grib_accessor_class_statistics_spectral.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *
@@ -29,8 +28,7 @@ void grib_accessor_statistics_spectral_t::init(const long l, grib_arguments* c)
     flags_ |= GRIB_ACCESSOR_FLAG_FUNCTION;
 
     number_of_elements_ = 4;
-    v_                  = (double*)grib_context_malloc(context_,
-                                                       sizeof(double) * number_of_elements_);
+    v_ = (double*)grib_context_malloc(context_, sizeof(double) * number_of_elements_);
 
     length_ = 0;
     dirty_  = 1;
diff --git a/src/accessor/grib_accessor_class_step_human_readable.cc b/src/accessor/grib_accessor_class_step_human_readable.cc
index 5789d7af4..20f6ed199 100644
--- a/src/accessor/grib_accessor_class_step_human_readable.cc
+++ b/src/accessor/grib_accessor_class_step_human_readable.cc
@@ -1,4 +1,3 @@
-
 /*
  * (C) Copyright 2005- ECMWF.
  *