diff --git a/tools/bufr_copy.c b/tools/bufr_copy.c
index d021a9ad8..2926e8716 100644
--- a/tools/bufr_copy.c
+++ b/tools/bufr_copy.c
@@ -55,8 +55,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)
diff --git a/tools/bufr_index_build.c b/tools/bufr_index_build.c
index 7569ff28b..835efaa32 100644
--- a/tools/bufr_index_build.c
+++ b/tools/bufr_index_build.c
@@ -47,8 +47,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)
diff --git a/tools/grib_copy.c b/tools/grib_copy.c
index 2184fe4db..ef4d4fc3c 100644
--- a/tools/grib_copy.c
+++ b/tools/grib_copy.c
@@ -59,8 +59,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)
diff --git a/tools/grib_index_build.c b/tools/grib_index_build.c
index 917ed7f6e..25a2d7d71 100644
--- a/tools/grib_index_build.c
+++ b/tools/grib_index_build.c
@@ -46,8 +46,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)
diff --git a/tools/grib_merge.c b/tools/grib_merge.c
index c22f90893..d4db61ccc 100644
--- a/tools/grib_merge.c
+++ b/tools/grib_merge.c
@@ -64,8 +64,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)
diff --git a/tools/grib_to_netcdf.c b/tools/grib_to_netcdf.c
index 31e0fe173..d2ccd49a0 100644
--- a/tools/grib_to_netcdf.c
+++ b/tools/grib_to_netcdf.c
@@ -3956,7 +3956,7 @@ struct KindValue
 
 int main(int argc, char* argv[])
 {
-    int i, ret = 0;
+    int i = 0;
 
     /* GRIB-413: Collect all program arguments into a string */
     const size_t maxLen = sizeof(argvString);
@@ -3969,9 +3969,7 @@ int main(int argc, char* argv[])
         if (i != argc - 1)
             strcat(argvString, " ");
     }
-    ret = grib_tool(argc, argv);
-
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)
diff --git a/tools/gts_copy.c b/tools/gts_copy.c
index 524bd25cb..7bc7a8825 100644
--- a/tools/gts_copy.c
+++ b/tools/gts_copy.c
@@ -46,8 +46,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)
diff --git a/tools/metar_copy.c b/tools/metar_copy.c
index 3d6c52302..cbbbb8e93 100644
--- a/tools/metar_copy.c
+++ b/tools/metar_copy.c
@@ -46,8 +46,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)