diff --git a/src/accessor/grib_accessor_class_expanded_descriptors.cc b/src/accessor/grib_accessor_class_expanded_descriptors.cc
index d70a29c9c..c2f7518a1 100644
--- a/src/accessor/grib_accessor_class_expanded_descriptors.cc
+++ b/src/accessor/grib_accessor_class_expanded_descriptors.cc
@@ -213,7 +213,7 @@ void grib_accessor_expanded_descriptors_t::__expand(bufr_descriptors_array* unex
                 Assert( uidx->F == 1 );
                 Assert( uidx->Y == 0 );
                 // ECC-1958 and ECC-1054:
-                // Here size can exceed 63 (num bits in X is 6)
+                // Here X is used to store the size which can exceed 63. The normal X is 6 bits wide so max=63
                 // We need to set X but not the descriptor code
                 uidx->X = (int)(size - 1);
                 if (size < 64)
diff --git a/src/eccodes_prototypes.h b/src/eccodes_prototypes.h
index fcc74f3f2..a7e912ed1 100644
--- a/src/eccodes_prototypes.h
+++ b/src/eccodes_prototypes.h
@@ -799,17 +799,6 @@ grib_expression* new_sub_string_expression(grib_context* c, const char* value, s
 //int grib_nearest_get_radius(grib_handle* h, double* radiusInKm);
 //void grib_binary_search(const double xx[], const size_t n, double x, size_t* ju, size_t* jl);
 //int grib_nearest_find_multiple(const grib_handle* h, int is_lsm, const double* inlats, const double* inlons, long npoints, double* outlats, double* outlons, double* values, double* distances, int* indexes);
-//int grib_nearest_find_generic(grib_nearest* nearest, grib_handle* h, double inlat, double inlon, unsigned long flags,
-//                              const char* values_keyname,
-//                              double** out_lats,
-//                              int* out_lats_count,
-//                              double** out_lons,
-//                              int* out_lons_count,
-//                              double** out_distances,
-//                              double* outlats, double* outlons, double* values, double* distances, int* indexes, size_t* len);
-
-/* grib_nearest_class.cc */
-//eccodes::geo_nearest::Nearest* grib_nearest_factory(grib_handle* h, grib_arguments* args, int* error);
 
 /* grib_iterator.cc */
 int grib_get_data(const grib_handle* h, double* lats, double* lons, double* values);
diff --git a/src/geo_nearest/grib_nearest_class_latlon_reduced.cc b/src/geo_nearest/grib_nearest_class_latlon_reduced.cc
index d7e54da11..6eb1500a0 100644
--- a/src/geo_nearest/grib_nearest_class_latlon_reduced.cc
+++ b/src/geo_nearest/grib_nearest_class_latlon_reduced.cc
@@ -227,9 +227,7 @@ int LatlonReduced::find_global(grib_handle* h,
         if (!distances_)
             return GRIB_OUT_OF_MEMORY;
 
-        //void grib_binary_search(const double xx[], const size_t n, double x, size_t* ju, size_t* jl)
-        grib_binary_search(lats_, ilat - 1, inlat,
-                           &(j_[0]), &(j_[1]));
+        grib_binary_search(lats_, ilat - 1, inlat, &(j_[0]), &(j_[1]));
 
         nlon = 0;
         for (jj = 0; jj < j_[0]; jj++)
diff --git a/src/geo_nearest/grib_nearest_class_mercator.cc b/src/geo_nearest/grib_nearest_class_mercator.cc
index e8d1935f7..06558ed93 100644
--- a/src/geo_nearest/grib_nearest_class_mercator.cc
+++ b/src/geo_nearest/grib_nearest_class_mercator.cc
@@ -36,14 +36,12 @@ int Mercator::find(grib_handle* h,
 {
     return grib_nearest_find_generic(
         h, inlat, inlon, flags, /* inputs */
-
         values_key_,  /* outputs to set the 'self' object */
         &(lats_),
         &(lats_count_),
         &(lons_),
         &(lons_count_),
         &(distances_),
-
         outlats, outlons,  /* outputs of the find function */
         values, distances, indexes, len);
 }
diff --git a/src/geo_nearest/grib_nearest_class_polar_stereographic.cc b/src/geo_nearest/grib_nearest_class_polar_stereographic.cc
index ed223f285..1eb52d06b 100644
--- a/src/geo_nearest/grib_nearest_class_polar_stereographic.cc
+++ b/src/geo_nearest/grib_nearest_class_polar_stereographic.cc
@@ -36,14 +36,12 @@ int PolarStereographic::find(grib_handle* h,
 {
     return grib_nearest_find_generic(
         h, inlat, inlon, flags, /* inputs */
-
         values_key_,   /* outputs to set the 'self' object */
         &(lats_),
         &(lats_count_),
         &(lons_),
         &(lons_count_),
         &(distances_),
-
         outlats, outlons,  /* outputs of the find function */
         values, distances, indexes, len);
 }