From bb5211e9e300c082f6787e5d779baba6df6eadc7 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Tue, 16 Jan 2024 12:40:17 +0000
Subject: [PATCH] Definitions: Cleanup

---
 definitions/grib2/local.destine.1.def         |  2 +-
 definitions/grib2/template.1.0.def            |  2 +-
 definitions/grib2/template.1.1.def            |  2 +-
 definitions/grib2/template.1.2.def            |  4 +--
 definitions/grib2/template.3.0.def            |  4 +--
 definitions/grib2/template.3.1.def            |  6 ++---
 definitions/grib2/template.3.10.def           |  6 ++---
 definitions/grib2/template.3.100.def          | 17 +++++-------
 definitions/grib2/template.3.1000.def         | 27 +++++++++----------
 definitions/grib2/template.3.110.def          | 19 +++++++------
 definitions/grib2/template.3.1100.def         |  4 +--
 definitions/grib2/template.3.12.def           |  6 ++---
 definitions/grib2/template.3.120.def          |  2 +-
 definitions/grib2/template.3.130.def          |  2 +-
 definitions/grib2/template.3.140.def          |  4 +--
 definitions/grib2/template.3.150.def          |  6 ++---
 definitions/grib2/template.3.2.def            |  6 ++---
 definitions/grib2/template.3.20.def           |  4 +--
 definitions/grib2/template.3.3.def            |  8 +++---
 definitions/grib2/template.3.30.def           |  6 ++---
 definitions/grib2/template.3.31.def           |  6 ++---
 definitions/grib2/template.3.4.def            |  4 +--
 definitions/grib2/template.3.40.def           |  4 +--
 definitions/grib2/template.3.41.def           |  6 ++---
 definitions/grib2/template.3.42.def           |  6 ++---
 definitions/grib2/template.3.43.def           |  8 +++---
 definitions/grib2/template.3.5.def            |  6 ++---
 definitions/grib2/template.3.50.def           |  2 +-
 definitions/grib2/template.3.51.def           |  4 +--
 definitions/grib2/template.3.52.def           |  4 +--
 definitions/grib2/template.3.53.def           |  6 ++---
 definitions/grib2/template.3.61.def           |  2 +-
 definitions/grib2/template.3.62.def           |  6 ++---
 definitions/grib2/template.3.63.def           |  8 +++---
 definitions/grib2/template.3.90.def           |  6 ++---
 definitions/grib2/template.3.gaussian.def     |  4 +--
 definitions/grib2/template.3.latlon.def       |  4 +--
 definitions/grib2/template.3.latlon_vares.def | 10 +++----
 .../grib2/template.3.spherical_harmonics.def  | 18 ++++++-------
 definitions/grib2/template.5.0.def            |  4 +--
 definitions/grib2/template.5.1.def            |  2 +-
 definitions/grib2/template.5.2.def            |  4 +--
 definitions/grib2/template.5.3.def            |  4 +--
 definitions/grib2/template.5.40.def           |  4 +--
 definitions/grib2/template.5.41.def           |  4 +--
 definitions/grib2/template.5.42.def           |  4 +--
 definitions/grib2/template.5.50.def           |  4 +--
 definitions/grib2/template.5.50000.def        |  4 +--
 definitions/grib2/template.5.51.def           |  2 +-
 definitions/grib2/template.5.53.def           |  2 +-
 definitions/grib2/template.5.61.def           |  4 +--
 51 files changed, 142 insertions(+), 151 deletions(-)

diff --git a/definitions/grib2/local.destine.1.def b/definitions/grib2/local.destine.1.def
index db1f2f389..ccb9bfbfd 100644
--- a/definitions/grib2/local.destine.1.def
+++ b/definitions/grib2/local.destine.1.def
@@ -1,7 +1,7 @@
 # DestinE MARS layout
 
 # Base keywords for all datasets
-include "grib2/local.destine.base.def";
+include "grib2/local.destine.base.def"
 
 # Keywords based on dataset
 template_nofail datasetTemplate "grib2/local.destine.[dataset:s].def";
diff --git a/definitions/grib2/template.1.0.def b/definitions/grib2/template.1.0.def
index 0f8f32271..9c73ed2cc 100644
--- a/definitions/grib2/template.1.0.def
+++ b/definitions/grib2/template.1.0.def
@@ -2,4 +2,4 @@
 
 # TEMPLATE 1.0, Calendar Definition
 
-include "grib2/template.1.calendar.def";
+include "grib2/template.1.calendar.def"
diff --git a/definitions/grib2/template.1.1.def b/definitions/grib2/template.1.1.def
index 7fcf51f53..6d559c4d7 100644
--- a/definitions/grib2/template.1.1.def
+++ b/definitions/grib2/template.1.1.def
@@ -2,4 +2,4 @@
 
 # TEMPLATE 1.1, Paleontological Offset
 
-include "grib2/template.1.offset.def";
+include "grib2/template.1.offset.def"
diff --git a/definitions/grib2/template.1.2.def b/definitions/grib2/template.1.2.def
index 3d5c0e3ba..3544cd8ef 100644
--- a/definitions/grib2/template.1.2.def
+++ b/definitions/grib2/template.1.2.def
@@ -2,5 +2,5 @@
 
 # TEMPLATE 1.2, Calendar Definition and Paleontological Offset
 
-include "grib2/template.1.calendar.def";
-include "grib2/template.1.offset.def";
+include "grib2/template.1.calendar.def"
+include "grib2/template.1.offset.def"
diff --git a/definitions/grib2/template.3.0.def b/definitions/grib2/template.3.0.def
index 11b5f0b0c..309391679 100644
--- a/definitions/grib2/template.3.0.def
+++ b/definitions/grib2/template.3.0.def
@@ -2,5 +2,5 @@
 
 # TEMPLATE 3.0, Latitude/longitude (or equidistant cylindrical, or Plate Carree)
 
-include "grib2/template.3.shape_of_the_earth.def";
-include "grib2/template.3.latlon.def";
+include "grib2/template.3.shape_of_the_earth.def"
+include "grib2/template.3.latlon.def"
diff --git a/definitions/grib2/template.3.1.def b/definitions/grib2/template.3.1.def
index 1cfca8e5d..45cd7200f 100644
--- a/definitions/grib2/template.3.1.def
+++ b/definitions/grib2/template.3.1.def
@@ -2,6 +2,6 @@
 
 # TEMPLATE 3.1, Rotated Latitude/longitude (or equidistant cylindrical, or Plate Carree)
 
-include "grib2/template.3.shape_of_the_earth.def";
-include "grib2/template.3.latlon.def";
-include "grib2/template.3.rotation.def";
+include "grib2/template.3.shape_of_the_earth.def"
+include "grib2/template.3.latlon.def"
+include "grib2/template.3.rotation.def"
diff --git a/definitions/grib2/template.3.10.def b/definitions/grib2/template.3.10.def
index df1821add..6fb8f1a46 100644
--- a/definitions/grib2/template.3.10.def
+++ b/definitions/grib2/template.3.10.def
@@ -1,7 +1,7 @@
 # (C) Copyright 2005- ECMWF.
 
 # TEMPLATE 3.10, Mercator
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 constant isGridded = true;
 
@@ -27,7 +27,7 @@ signed[4] longitudeOfFirstGridPoint : edition_specific,no_copy;
 alias Lo1 =  longitudeOfFirstGridPoint;
 meta geography.longitudeOfFirstGridPointInDegrees scale(longitudeOfFirstGridPoint,oneConstant,grib2divider,truncateDegrees) : dump;
 
-include "grib2/template.3.resolution_flags.def";
+include "grib2/template.3.resolution_flags.def"
 
 # LaD - Latitude(s) at which the Mercator projection intersects the Earth
 # (Latitude(s) where Di and Dj are specified)
@@ -44,7 +44,7 @@ signed[4] longitudeOfLastGridPoint: edition_specific,no_copy ;
 alias Lo2 =  longitudeOfLastGridPoint;
 meta geography.longitudeOfLastGridPointInDegrees scale(longitudeOfLastGridPoint,oneConstant,grib2divider,truncateDegrees) : dump;
 
-include "grib2/template.3.scanning_mode.def";
+include "grib2/template.3.scanning_mode.def"
 
 # Orientation of the grid, angle between i direction on the map and the equator
 # NOTE 1: Limited to the range of 0 to 90 degrees; if the angle of orientation of the grid is neither 0 nor 90 degrees,
diff --git a/definitions/grib2/template.3.100.def b/definitions/grib2/template.3.100.def
index 76881b671..8f44d4d42 100644
--- a/definitions/grib2/template.3.100.def
+++ b/definitions/grib2/template.3.100.def
@@ -3,16 +3,16 @@
 # TEMPLATE 3.100, Triangular grid based on an icosahedron (see Attachment I.2-GRIB-Att.)
 constant isGridded = true;
 
-# n2 - exponent of 2 for the number of intervals on main triangle sides
+# Exponent of 2 for the number of intervals on main triangle sides
 unsigned[1] n2  : dump ;
 
-# n3 - exponent of 3 for the number of intervals on main triangle sides
+# Exponent of 3 for the number of intervals on main triangle sides
 unsigned[1] n3  : dump ;
 
-# Ni - number of intervals on main triangle sides of the icosahedron
+# Number of intervals on main triangle sides of the icosahedron
 unsigned[2] Ni  : dump ;
 
-# nd - Number of diamonds
+# Number of diamonds
 unsigned[1] nd  : dump ;
 alias numberOfDiamonds=nd;
 
@@ -28,17 +28,12 @@ meta geography.longitudeOfThePolePointInDegrees g2lon(longitudeOfThePolePoint);
 unsigned[4] longitudeOfFirstDiamondCentreLine : dump ;
 meta geography.longitudeOfFirstDiamondCentreLineInDegrees g2lon(longitudeOfFirstDiamondCentreLine);
 
-# Grid point position
 codetable[1] gridPointPosition ('3.8.table',masterDir,localDir);
 
-# Numbering order of diamonds
 flags[1] numberingOrderOfDiamonds 'grib2/tables/[tablesVersion]/3.9.table';
 
-# Scanning mode for one diamond
 flags[1] scanningModeForOneDiamond 'grib2/tables/[tablesVersion]/3.10.table';
 
-# nt - total number of grid points
-unsigned[4] totalNumberOfGridPoints  : dump ;
-
-alias nt  = totalNumberOfGridPoints;
+unsigned[4] totalNumberOfGridPoints : dump ;
+alias nt = totalNumberOfGridPoints;
 
diff --git a/definitions/grib2/template.3.1000.def b/definitions/grib2/template.3.1000.def
index eda324224..e76507aaf 100644
--- a/definitions/grib2/template.3.1000.def
+++ b/definitions/grib2/template.3.1000.def
@@ -1,7 +1,7 @@
 # (C) Copyright 2005- ECMWF.
 
 # TEMPLATE 3.1000, Cross-section grid, with points equally spaced on the horizontal
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 constant isGridded = true;
 
@@ -12,27 +12,26 @@ unsigned[4] numberOfHorizontalPoints : dump ;
 unsigned[4] basicAngleOfTheInitialProductionDomain = 0;
 
 # Subdivisions of basic angle used to define extreme longitudes and latitudes
-unsigned[4] subdivisionsOfBasicAngle = missing() : can_be_missing;;
+unsigned[4] subdivisionsOfBasicAngle = missing() : can_be_missing;
 
-# La1 - latitude of first grid point
+# Latitude of first grid point
 signed[4] latitudeOfFirstGridPoint : edition_specific ;
-
 alias La1 = latitudeOfFirstGridPoint;
-# Lo1 - longitude of first grid point
-unsigned[4] longitudeOfFirstGridPoint : edition_specific;
 
+# Longitude of first grid point
+unsigned[4] longitudeOfFirstGridPoint : edition_specific;
 alias Lo1 = longitudeOfFirstGridPoint;
 
-include "grib2/template.3.scanning_mode.def";
+include "grib2/template.3.scanning_mode.def"
 
-# La2 - latitude of last grid point
+# Latitude of last grid point
 signed[4] latitudeOfLastGridPoint : edition_specific;
-
 alias La2  = latitudeOfLastGridPoint;
-# Lo2 - longitude of last grid point
-unsigned[4] longitudeOfLastGridPoint: edition_specific ;
 
+# Longitude of last grid point
+unsigned[4] longitudeOfLastGridPoint: edition_specific ;
 alias Lo2 =  longitudeOfLastGridPoint;
+
 # Type of horizontal line
 codetable[1] typeOfHorizontalLine ('3.20.table',masterDir,localDir) : dump ;
 
@@ -45,10 +44,8 @@ codetable[1] meaningOfVerticalCoordinate ('3.15.table',masterDir,localDir) : dum
 # Vertical dimension coordinate values definition
 codetable[1] verticalCoordinate ('3.21.table',masterDir,localDir) : dump ;
 
-# NC - Number of coefficients or values used to specify vertical coordinates
+# Number of coefficients or values used to specify vertical coordinates
 unsigned[2] NC : dump ;
 
-# Octets 67-(66+NC*4) : Coefficients to define vertical dimension coordinate values in functional form, or the explicit coordinate values
+# Octets 67-(66+NC*4): Coefficients to define vertical dimension coordinate values in functional form, or the explicit coordinate values
 # (IEEE 32-bit floating-point values)
-# ???? coefficients_to_define_vertical_dimension_coordinate_values_in_functional_form_or_the_explicit_coordinate_values
-
diff --git a/definitions/grib2/template.3.110.def b/definitions/grib2/template.3.110.def
index ee332ca7a..fae3e5420 100644
--- a/definitions/grib2/template.3.110.def
+++ b/definitions/grib2/template.3.110.def
@@ -1,41 +1,40 @@
 # (C) Copyright 2005- ECMWF.
 
 # TEMPLATE 3.110, Equatorial azimuthal equidistant projection
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 constant isGridded = true;
 
-# Nx - number of points along X-axis
+# Number of points along X-axis
 unsigned[4] numberOfPointsAlongXAxis : dump;
 alias Nx = numberOfPointsAlongXAxis;
 alias numberOfPointsAlongAParallel = Nx;
 alias Ni = Nx;
 
-# Ny - number of points along Y-axis
+# Number of points along Y-axis
 unsigned[4] numberOfPointsAlongYAxis : dump;
 alias Ny = numberOfPointsAlongYAxis;
 alias numberOfPointsAlongAMeridian = Ny;
 alias Nj = Ny;
 
-# La1 - latitude of tangency point (centre of grid)
+# Latitude of tangency point (centre of grid)
 signed[4] latitudeOfTangencyPoint  : dump;
-
 alias La1 = latitudeOfTangencyPoint;
-# Lo1 - longitude of tangency point
-unsigned[4] longitudeOfTangencyPoint : dump;
 
+# Longitude of tangency point
+unsigned[4] longitudeOfTangencyPoint : dump;
 alias Lo1 = longitudeOfTangencyPoint;
 
 # Resolution and component flag
 flags[1] resolutionAndComponentFlags 'grib2/tables/[tablesVersion]/3.3.table' : dump;
 
-# Dx - X-direction grid length in units of 10 -3 m as measured at the point of the axis
+# X-direction grid length in units of 10 -3 m as measured at the point of the axis
 unsigned[4] Dx : dump;
 
-# Dy - Y-direction grid length in units of 10 -3 m as measured at the point of the axis
+# Y-direction grid length in units of 10 -3 m as measured at the point of the axis
 unsigned[4] Dy : dump;
 
 # Projection centre flag
 unsigned[1] projectionCentreFlag : dump;
 
-include "grib2/template.3.scanning_mode.def";
+include "grib2/template.3.scanning_mode.def"
diff --git a/definitions/grib2/template.3.1100.def b/definitions/grib2/template.3.1100.def
index e9c0b75f7..26fe4a92a 100644
--- a/definitions/grib2/template.3.1100.def
+++ b/definitions/grib2/template.3.1100.def
@@ -1,7 +1,7 @@
 # (C) Copyright 2005- ECMWF.
 
 # TEMPLATE 3.1100, Hovmoller diagram grid with points equally spaced on the horizontal
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 constant isGridded = true;
 
@@ -23,7 +23,7 @@ unsigned[4] longitudeOfFirstGridPoint : edition_specific,dump;
 
 alias Lo1  =longitudeOfFirstGridPoint;
 
-include "grib2/template.3.scanning_mode.def";
+include "grib2/template.3.scanning_mode.def"
 
 # La2 - latitude of last grid point
 signed[4] latitudeOfLastGridPoint : edition_specific,dump;
diff --git a/definitions/grib2/template.3.12.def b/definitions/grib2/template.3.12.def
index c96177bf8..fa3b2a8a0 100644
--- a/definitions/grib2/template.3.12.def
+++ b/definitions/grib2/template.3.12.def
@@ -1,7 +1,7 @@
 # (C) Copyright 2005- ECMWF.
 
 # TEMPLATE 3.12, Transverse Mercator
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 constant isGridded = true;
 
@@ -27,7 +27,7 @@ signed[4] longitudeOfReferencePoint : edition_specific,no_copy;
 alias LoR = longitudeOfReferencePoint;
 meta geography.longitudeOfReferencePointInDegrees scale(longitudeOfReferencePoint,oneConstant,grib2divider,truncateDegrees) : dump;
 
-include "grib2/template.3.resolution_flags.def";
+include "grib2/template.3.resolution_flags.def"
 
 # m - scale factor at reference point ratio of distance on map to distance on spheroid
 # (IEEE 32-bit floating-point values)
@@ -45,7 +45,7 @@ signed[4] YR : edition_specific,no_copy ;
 alias falseNorthing = YR;
 meta geography.YRInMetres scale(YR,one,hundred) : dump;
 
-include "grib2/template.3.scanning_mode.def";
+include "grib2/template.3.scanning_mode.def"
 
 # Di - i-direction increment length in units of 10-2 m
 unsigned[4] Di : edition_specific,no_copy;
diff --git a/definitions/grib2/template.3.120.def b/definitions/grib2/template.3.120.def
index 34e77d345..e208cab7c 100644
--- a/definitions/grib2/template.3.120.def
+++ b/definitions/grib2/template.3.120.def
@@ -34,7 +34,7 @@ alias Dx  = spacingOfBinsAlongRadials;
 unsigned[4] offsetFromOriginToInnerBound;
 alias Dstart =  offsetFromOriginToInnerBound;
 
-include "grib2/template.3.scanning_mode.def";
+include "grib2/template.3.scanning_mode.def"
 
 # Octets 40-(39+4Nr) : For each of Nr radials:
 radials list(numberOfRadials){
diff --git a/definitions/grib2/template.3.130.def b/definitions/grib2/template.3.130.def
index 960a65b82..eec6dbc5b 100644
--- a/definitions/grib2/template.3.130.def
+++ b/definitions/grib2/template.3.130.def
@@ -6,7 +6,7 @@ constant isGridded = true;
 
 # Note: This template is deprecated.
 
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 points list(numberOfDataPoints) {
     signed[4] latitude;
diff --git a/definitions/grib2/template.3.140.def b/definitions/grib2/template.3.140.def
index b14cd1c2e..d5c7b4666 100644
--- a/definitions/grib2/template.3.140.def
+++ b/definitions/grib2/template.3.140.def
@@ -1,7 +1,7 @@
 # (C) Copyright 2005- ECMWF.
 
 # TEMPLATE 3.140, Lambert azimuthal equal area projection
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 constant isGridded = true;
 
@@ -52,7 +52,7 @@ alias Dy  = yDirectionGridLengthInMillimetres ;
 meta geography.yDirectionGridLengthInMetres scale(yDirectionGridLengthInMillimetres,one,thousand,truncateDegrees): dump;
 alias DyInMetres = yDirectionGridLengthInMetres;
 
-include "grib2/template.3.scanning_mode.def";
+include "grib2/template.3.scanning_mode.def"
 
 iterator lambert_azimuthal_equal_area(
     numberOfPoints,missingValue,values,
diff --git a/definitions/grib2/template.3.150.def b/definitions/grib2/template.3.150.def
index ea9f76811..360e4d579 100644
--- a/definitions/grib2/template.3.150.def
+++ b/definitions/grib2/template.3.150.def
@@ -1,7 +1,7 @@
 # TEMPLATE 3.150 - The HEALPix grid
 # See https://healpix.jpl.nasa.gov/pdf/intro.pdf
 
-include "grib2/template.3.shape_of_the_earth.def";
-include "grib2/template.3.resolution_flags.def";
-include "grib2/template.3.healpix.def";
+include "grib2/template.3.shape_of_the_earth.def"
+include "grib2/template.3.resolution_flags.def"
+include "grib2/template.3.healpix.def"
 
diff --git a/definitions/grib2/template.3.2.def b/definitions/grib2/template.3.2.def
index f587f9886..cc422db4d 100644
--- a/definitions/grib2/template.3.2.def
+++ b/definitions/grib2/template.3.2.def
@@ -2,6 +2,6 @@
 
 # TEMPLATE 3.2, Stretched Latitude/longitude (or equidistant cylindrical, or Plate Carree)
 
-include "grib2/template.3.shape_of_the_earth.def";
-include "grib2/template.3.latlon.def";
-include "grib2/template.3.stretching.def";
+include "grib2/template.3.shape_of_the_earth.def"
+include "grib2/template.3.latlon.def"
+include "grib2/template.3.stretching.def"
diff --git a/definitions/grib2/template.3.20.def b/definitions/grib2/template.3.20.def
index fa596d063..80b1dce80 100644
--- a/definitions/grib2/template.3.20.def
+++ b/definitions/grib2/template.3.20.def
@@ -1,7 +1,7 @@
 # (C) Copyright 2005- ECMWF.
 
 # TEMPLATE 3.20, Polar stereographic projection
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 constant isGridded = true;
 
@@ -63,7 +63,7 @@ flags[1] projectionCentreFlag 'grib2/tables/[tablesVersion]/3.5.table' : dump;
 # If bit 1 is 1, then the South Pole is on the projection plane
 flagbit southPoleOnProjectionPlane(projectionCentreFlag,7) : dump;   # WMO bit 1
 
-include "grib2/template.3.scanning_mode.def";
+include "grib2/template.3.scanning_mode.def"
 
 iterator polar_stereographic(numberOfPoints,missingValue,values,
           radius,Nx,Ny,
diff --git a/definitions/grib2/template.3.3.def b/definitions/grib2/template.3.3.def
index 908695d1e..264a09c7a 100644
--- a/definitions/grib2/template.3.3.def
+++ b/definitions/grib2/template.3.3.def
@@ -2,8 +2,8 @@
 
 # TEMPLATE 3.3, Stretched and Rotated Latitude/longitude (or equidistant cylindrical, or Plate Carree)
 
-include "grib2/template.3.shape_of_the_earth.def";
-include "grib2/template.3.latlon.def";
-include "grib2/template.3.rotation.def";
-include "grib2/template.3.stretching.def";
+include "grib2/template.3.shape_of_the_earth.def"
+include "grib2/template.3.latlon.def"
+include "grib2/template.3.rotation.def"
+include "grib2/template.3.stretching.def"
 
diff --git a/definitions/grib2/template.3.30.def b/definitions/grib2/template.3.30.def
index 387009b85..0168c967d 100644
--- a/definitions/grib2/template.3.30.def
+++ b/definitions/grib2/template.3.30.def
@@ -1,7 +1,7 @@
 # (C) Copyright 2005- ECMWF.
 
 # TEMPLATE 3.30, Lambert conformal
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 constant isGridded = true;
 
@@ -32,7 +32,7 @@ meta geography.longitudeOfFirstGridPointInDegrees
 alias Lo1InDegrees = longitudeOfFirstGridPointInDegrees;
 #meta longitudeOfFirstGridPointInMicrodegrees times(longitudeOfFirstGridPoint,oneConstant) : no_copy;
 
-include "grib2/template.3.resolution_flags.def";
+include "grib2/template.3.resolution_flags.def"
 
 # LaD - Latitude where Dx and Dy are specified
 signed[4] LaD : edition_specific;
@@ -58,7 +58,7 @@ meta geography.DyInMetres scale(Dy,one,thousand) : dump;
 # Projection centre flag
 flags[1] projectionCentreFlag 'grib2/tables/[tablesVersion]/3.5.table' : dump;
 
-include "grib2/template.3.scanning_mode.def";
+include "grib2/template.3.scanning_mode.def"
 
 # Latin 1 - first latitude from the pole at which the secant cone cuts the sphere
 signed[4] Latin1   : edition_specific;
diff --git a/definitions/grib2/template.3.31.def b/definitions/grib2/template.3.31.def
index e10d53b99..d6e85c6c3 100644
--- a/definitions/grib2/template.3.31.def
+++ b/definitions/grib2/template.3.31.def
@@ -1,7 +1,7 @@
 # (C) Copyright 2005- ECMWF.
 
 # TEMPLATE 3.31, Albers equal area
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 constant isGridded = true;
 
@@ -23,7 +23,7 @@ alias La1  = latitudeOfFirstGridPoint;
 unsigned[4] longitudeOfFirstGridPoint : edition_specific,dump;
 alias Lo1  = longitudeOfFirstGridPoint;
 
-include "grib2/template.3.resolution_flags.def";
+include "grib2/template.3.resolution_flags.def"
 
 # LaD - Latitude where Dx and Dy are specified
 signed[4] LaD  : dump;
@@ -42,7 +42,7 @@ alias Dy =  yDirectionGridLength;
 
 # Projection centre flag
 flags[1] projectionCentreFlag 'grib2/tables/[tablesVersion]/3.5.table' : dump;
-include "grib2/template.3.scanning_mode.def";
+include "grib2/template.3.scanning_mode.def"
 
 # Latin 1 - first latitude from the pole at which the secant cone cuts the sphere
 signed[4] Latin1 :edition_specific;
diff --git a/definitions/grib2/template.3.4.def b/definitions/grib2/template.3.4.def
index 4e533b4b2..224d12e7b 100644
--- a/definitions/grib2/template.3.4.def
+++ b/definitions/grib2/template.3.4.def
@@ -1,5 +1,5 @@
 # (C) Copyright 2005- ECMWF.
 
 # TEMPLATE 3.4, Variable resolution latitude/longitude
-include "grib2/template.3.shape_of_the_earth.def";
-include "grib2/template.3.latlon_vares.def";
+include "grib2/template.3.shape_of_the_earth.def"
+include "grib2/template.3.latlon_vares.def"
diff --git a/definitions/grib2/template.3.40.def b/definitions/grib2/template.3.40.def
index 4cc651ed1..2f1c86a27 100644
--- a/definitions/grib2/template.3.40.def
+++ b/definitions/grib2/template.3.40.def
@@ -2,5 +2,5 @@
 
 # TEMPLATE 3.40, Gaussian latitude/longitude
 
-include "grib2/template.3.shape_of_the_earth.def";
-include "grib2/template.3.gaussian.def";
+include "grib2/template.3.shape_of_the_earth.def"
+include "grib2/template.3.gaussian.def"
diff --git a/definitions/grib2/template.3.41.def b/definitions/grib2/template.3.41.def
index e3443dd34..7c72c31e3 100644
--- a/definitions/grib2/template.3.41.def
+++ b/definitions/grib2/template.3.41.def
@@ -2,6 +2,6 @@
 
 # TEMPLATE 3.41, Rotated Gaussian latitude/longitude
 
-include "grib2/template.3.shape_of_the_earth.def";
-include "grib2/template.3.gaussian.def";
-include "grib2/template.3.rotation.def";
+include "grib2/template.3.shape_of_the_earth.def"
+include "grib2/template.3.gaussian.def"
+include "grib2/template.3.rotation.def"
diff --git a/definitions/grib2/template.3.42.def b/definitions/grib2/template.3.42.def
index 192fd676d..8ec6895eb 100644
--- a/definitions/grib2/template.3.42.def
+++ b/definitions/grib2/template.3.42.def
@@ -2,6 +2,6 @@
 
 # TEMPLATE 3.42, Stretched Gaussian latitude/longitude
 
-include "grib2/template.3.shape_of_the_earth.def";
-include "grib2/template.3.gaussian.def";
-include "grib2/template.3.stretching.def";
+include "grib2/template.3.shape_of_the_earth.def"
+include "grib2/template.3.gaussian.def"
+include "grib2/template.3.stretching.def"
diff --git a/definitions/grib2/template.3.43.def b/definitions/grib2/template.3.43.def
index b1301137e..7e35de9d8 100644
--- a/definitions/grib2/template.3.43.def
+++ b/definitions/grib2/template.3.43.def
@@ -2,7 +2,7 @@
 
 # TEMPLATE 3.43, Stretched and rotated Gaussian latitude/longitude
 
-include "grib2/template.3.shape_of_the_earth.def";
-include "grib2/template.3.gaussian.def";
-include "grib2/template.3.rotation.def";
-include "grib2/template.3.stretching.def";
+include "grib2/template.3.shape_of_the_earth.def"
+include "grib2/template.3.gaussian.def"
+include "grib2/template.3.rotation.def"
+include "grib2/template.3.stretching.def"
diff --git a/definitions/grib2/template.3.5.def b/definitions/grib2/template.3.5.def
index ecfb3e07c..b80f9264e 100644
--- a/definitions/grib2/template.3.5.def
+++ b/definitions/grib2/template.3.5.def
@@ -2,6 +2,6 @@
 
 # TEMPLATE 3.5, Variable resolution rotated latitude/longitude
 
-include "grib2/template.3.shape_of_the_earth.def";
-include "grib2/template.3.latlon_vares.def";
-include "grib2/template.3.rotation.def";
+include "grib2/template.3.shape_of_the_earth.def"
+include "grib2/template.3.latlon_vares.def"
+include "grib2/template.3.rotation.def"
diff --git a/definitions/grib2/template.3.50.def b/definitions/grib2/template.3.50.def
index 6d869799c..3db24135a 100644
--- a/definitions/grib2/template.3.50.def
+++ b/definitions/grib2/template.3.50.def
@@ -2,4 +2,4 @@
 
 # TEMPLATE 3.50, Spherical harmonic coefficients
 
-include "grib2/template.3.spherical_harmonics.def";
+include "grib2/template.3.spherical_harmonics.def"
diff --git a/definitions/grib2/template.3.51.def b/definitions/grib2/template.3.51.def
index cd385a04c..633355082 100644
--- a/definitions/grib2/template.3.51.def
+++ b/definitions/grib2/template.3.51.def
@@ -2,5 +2,5 @@
 
 # TEMPLATE 3.51, Rotated spherical harmonic coefficients
 
-include "grib2/template.3.spherical_harmonics.def";
-include "grib2/template.3.rotation.def";
+include "grib2/template.3.spherical_harmonics.def"
+include "grib2/template.3.rotation.def"
diff --git a/definitions/grib2/template.3.52.def b/definitions/grib2/template.3.52.def
index 5b471bd0e..3d6975591 100644
--- a/definitions/grib2/template.3.52.def
+++ b/definitions/grib2/template.3.52.def
@@ -2,5 +2,5 @@
 
 # TEMPLATE 3.52, Stretched spherical harmonic coefficients
 
-include "grib2/template.3.spherical_harmonics.def";
-include "grib2/template.3.stretching.def";
+include "grib2/template.3.spherical_harmonics.def"
+include "grib2/template.3.stretching.def"
diff --git a/definitions/grib2/template.3.53.def b/definitions/grib2/template.3.53.def
index 7ad169452..69a93fca8 100644
--- a/definitions/grib2/template.3.53.def
+++ b/definitions/grib2/template.3.53.def
@@ -2,6 +2,6 @@
 
 # TEMPLATE 3.53, Stretched and rotated spherical harmonic coefficients
 
-include "grib2/template.3.spherical_harmonics.def";
-include "grib2/template.3.rotation.def";
-include "grib2/template.3.stretching.def";
+include "grib2/template.3.spherical_harmonics.def"
+include "grib2/template.3.rotation.def"
+include "grib2/template.3.stretching.def"
diff --git a/definitions/grib2/template.3.61.def b/definitions/grib2/template.3.61.def
index 0a9044ec6..2da3b7a99 100644
--- a/definitions/grib2/template.3.61.def
+++ b/definitions/grib2/template.3.61.def
@@ -7,7 +7,7 @@ transient biFourierMakeTemplate = 0;
 
 include "grib2/template.3.bf.def"
 
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 # La1 - latitude of first grid point
 signed[4] latitudeOfFirstGridPoint: edition_specific,no_copy ;
diff --git a/definitions/grib2/template.3.62.def b/definitions/grib2/template.3.62.def
index e1d2407ce..03f2808c3 100644
--- a/definitions/grib2/template.3.62.def
+++ b/definitions/grib2/template.3.62.def
@@ -7,7 +7,7 @@ transient biFourierMakeTemplate = 0;
 
 include "grib2/template.3.bf.def"
 
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 #  La1 - latitude of first grid point
 signed[4] latitudeOfFirstGridPoint : edition_specific ;
@@ -23,7 +23,7 @@ alias Lo1 =  longitudeOfFirstGridPoint;
 flags[1] resolutionAndComponentFlags 'grib2/tables/[tablesVersion]/3.3.table' : dump;
 
 #  LaD - Latitude where Dx and Dy are specified
-signed[4] LaD  : edition_specific;
+signed[4] LaD : edition_specific;
 alias latitudeWhereDxAndDyAreSpecified=LaD;
 meta geography.LaDInDegrees scale(LaD,oneConstant,grib2divider,truncateDegrees) : dump;
 alias latitudeWhereDxAndDyAreSpecifiedInDegrees=LaDInDegrees;
@@ -31,7 +31,7 @@ alias latitudeWhereDxAndDyAreSpecifiedInDegrees=LaDInDegrees;
 #  LoV - orientation of the grid
 #  LoV is the longitude value of the meridian which is parallel to the y-axis (or columns of the grid)
 #  along which latitude increases as the y-coordinate increases
-signed[4] orientationOfTheGrid  : edition_specific;
+signed[4] orientationOfTheGrid : edition_specific;
 alias LoV =  orientationOfTheGrid ;
 meta geography.orientationOfTheGridInDegrees scale(orientationOfTheGrid,oneConstant,grib2divider,truncateDegrees) : dump;
 
diff --git a/definitions/grib2/template.3.63.def b/definitions/grib2/template.3.63.def
index a9c90ce77..443283c5c 100644
--- a/definitions/grib2/template.3.63.def
+++ b/definitions/grib2/template.3.63.def
@@ -6,7 +6,7 @@ transient biFourierMakeTemplate = 0;
 
 include "grib2/template.3.bf.def"
 
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 #  La1 - latitude of first grid point
 signed[4] latitudeOfFirstGridPoint : edition_specific;
@@ -30,19 +30,19 @@ alias latitudeWhereDxAndDyAreSpecified=LaD;
 meta  geography.LaDInDegrees scale(LaD,one,grib2divider,truncateDegrees) : dump;
 
 #  LoV - Longitude of meridian parallel to Y-axis along which latitude increases as the Y-coordinate increases
-unsigned[4] LoV  : edition_specific;
+unsigned[4] LoV : edition_specific;
 meta  geography.LoVInDegrees scale(LoV,one,grib2divider,truncateDegrees) : dump;
 
 #  Projection centre flag
 flags[1] projectionCentreFlag 'grib2/tables/[tablesVersion]/3.5.table' : dump;
 
 #  Latin 1 - first latitude from the pole at which the secant cone cuts the sphere
-signed[4] Latin1   : edition_specific;
+signed[4] Latin1 : edition_specific;
 alias FirstLatitude=Latin1;
 meta  geography.Latin1InDegrees scale(Latin1,one,grib2divider,truncateDegrees) : dump;
 
 #  Latin 2 - second latitude from the pole at which the secant cone cuts the sphere
-signed[4] Latin2  : dump;
+signed[4] Latin2 : dump;
 alias SecondLatitude=Latin2;
 meta  geography.Latin2InDegrees scale(Latin2,one,grib2divider,truncateDegrees) : dump;
 
diff --git a/definitions/grib2/template.3.90.def b/definitions/grib2/template.3.90.def
index 62db324da..9f8ef1198 100644
--- a/definitions/grib2/template.3.90.def
+++ b/definitions/grib2/template.3.90.def
@@ -1,7 +1,7 @@
 # (C) Copyright 2005- ECMWF.
 
 # TEMPLATE 3.90, Space view perspective or orthographic
-include "grib2/template.3.shape_of_the_earth.def";
+include "grib2/template.3.shape_of_the_earth.def"
 
 constant isGridded = true;
 
@@ -25,7 +25,7 @@ signed[4] longitudeOfSubSatellitePoint;
 meta geography.latitudeOfSubSatellitePointInDegrees   scale(latitudeOfSubSatellitePoint,one,grib2divider,truncateDegrees) : dump;
 meta geography.longitudeOfSubSatellitePointInDegrees   scale(longitudeOfSubSatellitePoint,one,grib2divider,truncateDegrees) : dump;
 
-include "grib2/template.3.resolution_flags.def";
+include "grib2/template.3.resolution_flags.def"
 
 # dx - apparent diameter of Earth in grid lengths, in X-direction
 unsigned[4] dx : dump;
@@ -47,7 +47,7 @@ unsigned[4] Yp : no_copy;
 meta geography.YpInGridLengths scale(Yp,one,thousand) : dump;
 alias yCoordinateOfSubSatellitePoint=YpInGridLengths;
 
-include "grib2/template.3.scanning_mode.def";
+include "grib2/template.3.scanning_mode.def"
 
 # Orientation of the grid; i.e. the angle between the increasing Y-axis and the meridian
 # of the sub-satellite point in the direction of increasing latitude
diff --git a/definitions/grib2/template.3.gaussian.def b/definitions/grib2/template.3.gaussian.def
index 10505d281..e243b39eb 100644
--- a/definitions/grib2/template.3.gaussian.def
+++ b/definitions/grib2/template.3.gaussian.def
@@ -1,6 +1,6 @@
 # (C) Copyright 2005- ECMWF.
 
-include "grib2/template.3.grid.def";
+include "grib2/template.3.grid.def"
 
 #  Di - i direction increment
 unsigned[4] iDirectionIncrement : can_be_missing;
@@ -11,7 +11,7 @@ unsigned[4] N  : dump;
 alias numberOfParallelsBetweenAPoleAndTheEquator=N ;
 alias geography.N=N;
 
-include "grib2/template.3.scanning_mode.def";
+include "grib2/template.3.scanning_mode.def"
 
 modify Ni : can_be_missing,dump;
 
diff --git a/definitions/grib2/template.3.latlon.def b/definitions/grib2/template.3.latlon.def
index 2b6ace29b..407aa4eca 100644
--- a/definitions/grib2/template.3.latlon.def
+++ b/definitions/grib2/template.3.latlon.def
@@ -1,6 +1,6 @@
 # (C) Copyright 2005- ECMWF.
 
-include "grib2/template.3.grid.def";
+include "grib2/template.3.grid.def"
 
 # Di - i direction increment
 unsigned[4] iDirectionIncrement : can_be_missing,edition_specific;
@@ -12,7 +12,7 @@ unsigned[4] jDirectionIncrement : can_be_missing,edition_specific;
 alias Dj = jDirectionIncrement;
 alias Dy = jDirectionIncrement;
 
-include "grib2/template.3.scanning_mode.def";
+include "grib2/template.3.scanning_mode.def"
 
 meta g2grid g2grid(
   latitudeOfFirstGridPoint,
diff --git a/definitions/grib2/template.3.latlon_vares.def b/definitions/grib2/template.3.latlon_vares.def
index 3c29438ea..db25b45cf 100644
--- a/definitions/grib2/template.3.latlon_vares.def
+++ b/definitions/grib2/template.3.latlon_vares.def
@@ -1,4 +1,5 @@
 # (C) Copyright 2005- ECMWF.
+
 # Variable resolution latitude/longitude
 unsigned[4] Ni : dump;
 alias numberOfPointsAlongAParallel=Ni;
@@ -7,11 +8,10 @@ alias Nx = Ni;
 unsigned[4] Nj : dump;
 alias numberOfPointsAlongAMeridian=Nj;
 alias Ny = Nj;
-
 alias geography.Ni=Ni;
 alias geography.Nj=Nj;
 
-#  Basic angle of the initial production domain
+# Basic angle of the initial production domain
 unsigned[4] basicAngleOfTheInitialProductionDomain = 0;
 transient mBasicAngle=basicAngleOfTheInitialProductionDomain*oneMillionConstant;
 transient angleMultiplier  = 1;
@@ -24,7 +24,7 @@ when (basicAngleOfTheInitialProductionDomain == 0) {
   set mAngleMultiplier = mBasicAngle;
 }
 
-#  Subdivisions of basic angle used to define extreme longitudes and latitudes, and direction increments
+# Subdivisions of basic angle used to define extreme longitudes and latitudes, and direction increments
 unsigned[4] subdivisionsOfBasicAngle = missing() : can_be_missing;
 
 transient angleDivisor = 1000000;
@@ -39,9 +39,9 @@ include "grib2/template.3.resolution_flags.def"
 include "grib2/template.3.scanning_mode.def";
 
 longitudesList list(Ni) {
-    unsigned[4] longitude;
+   unsigned[4] longitude;
 }
 
 latitudesList list(Nj) {
-    signed[4] latitude;
+   signed[4] latitude;
 }
diff --git a/definitions/grib2/template.3.spherical_harmonics.def b/definitions/grib2/template.3.spherical_harmonics.def
index 0a295c2f7..6af68c820 100644
--- a/definitions/grib2/template.3.spherical_harmonics.def
+++ b/definitions/grib2/template.3.spherical_harmonics.def
@@ -3,23 +3,23 @@
 constant sphericalHarmonics=1;
 # constant dataRepresentationType  = 50;
 
-# J - pentagonal resolution parameter
-unsigned[4] J  : dump;
-alias pentagonalResolutionParameterJ=J ;
+# Pentagonal resolution parameter
+unsigned[4] J : dump;
+alias pentagonalResolutionParameterJ=J;
 alias geography.J=J;
 
-# K - pentagonal resolution parameter
-unsigned[4] K   : dump;
+# Pentagonal resolution parameter
+unsigned[4] K : dump;
 alias pentagonalResolutionParameterK=K;
 alias geography.K=K;
 
-# M - pentagonal resolution parameter
-unsigned[4] M   : dump;
-alias pentagonalResolutionParameterM = M ;
+# Pentagonal resolution parameter
+unsigned[4] M : dump;
+alias pentagonalResolutionParameterM = M;
 alias geography.M=M;
 
 # Representation type indicating the method used to define the norm
-codetable[1]  spectralType ('3.6.table',masterDir,localDir) = 1 : no_copy;
+codetable[1] spectralType ('3.6.table',masterDir,localDir) = 1 : no_copy;
 alias spectralDataRepresentationType=spectralType;
 
 # Representation mode indicating the order of the coefficients
diff --git a/definitions/grib2/template.5.0.def b/definitions/grib2/template.5.0.def
index 9ec20b0ea..709f8be74 100644
--- a/definitions/grib2/template.5.0.def
+++ b/definitions/grib2/template.5.0.def
@@ -2,6 +2,6 @@
 
 # TEMPLATE 5.0, Grid point data - simple packing
 
-include "grib2/template.5.packing.def";
-include "grib2/template.5.original_values.def";
+include "grib2/template.5.packing.def"
+include "grib2/template.5.original_values.def"
 
diff --git a/definitions/grib2/template.5.1.def b/definitions/grib2/template.5.1.def
index a12cd4153..8f1c22bea 100644
--- a/definitions/grib2/template.5.1.def
+++ b/definitions/grib2/template.5.1.def
@@ -4,7 +4,7 @@
 # Preliminary note:
 # This template was not validated at the time of publication and should be used with caution
 
-include "grib2/template.5.packing.def";
+include "grib2/template.5.packing.def"
 
 unsigned[1] matrixBitmapsPresent;
 # same as in edition 1
diff --git a/definitions/grib2/template.5.2.def b/definitions/grib2/template.5.2.def
index 165f70cc6..59f7f5342 100644
--- a/definitions/grib2/template.5.2.def
+++ b/definitions/grib2/template.5.2.def
@@ -2,8 +2,8 @@
 
 # TEMPLATE 5.2, Grid point data - complex packing
 
-include "grib2/template.5.packing.def";
-include "grib2/template.5.original_values.def";
+include "grib2/template.5.packing.def"
+include "grib2/template.5.original_values.def"
 
 # Group splitting method used
 codetable[1] groupSplittingMethodUsed ('5.4.table',masterDir,localDir);
diff --git a/definitions/grib2/template.5.3.def b/definitions/grib2/template.5.3.def
index 0d08b4e32..2640883f4 100644
--- a/definitions/grib2/template.5.3.def
+++ b/definitions/grib2/template.5.3.def
@@ -2,8 +2,8 @@
 
 # TEMPLATE 5.3, Grid point data - complex packing and spatial differencing
 
-include "grib2/template.5.packing.def";
-include "grib2/template.5.original_values.def";
+include "grib2/template.5.packing.def"
+include "grib2/template.5.original_values.def"
 
 # Group splitting method used
 codetable[1] groupSplittingMethodUsed ('5.4.table',masterDir,localDir);
diff --git a/definitions/grib2/template.5.40.def b/definitions/grib2/template.5.40.def
index 3b2f33ef0..51a56b1b7 100644
--- a/definitions/grib2/template.5.40.def
+++ b/definitions/grib2/template.5.40.def
@@ -2,8 +2,8 @@
 
 # TEMPLATE 5.40, Grid point data - JPEG 2000 Code Stream Format
 
-include "grib2/template.5.packing.def";
-include "grib2/template.5.original_values.def";
+include "grib2/template.5.packing.def"
+include "grib2/template.5.original_values.def"
 
 codetable[1] typeOfCompressionUsed ('5.40.table',masterDir,localDir) ;
 
diff --git a/definitions/grib2/template.5.41.def b/definitions/grib2/template.5.41.def
index bc3c621e8..58ebd8e34 100644
--- a/definitions/grib2/template.5.41.def
+++ b/definitions/grib2/template.5.41.def
@@ -2,5 +2,5 @@
 
 # TEMPLATE 5.41, Grid point data - PNG  Code Stream Format
 
-include "grib2/template.5.packing.def";
-include "grib2/template.5.original_values.def";
+include "grib2/template.5.packing.def"
+include "grib2/template.5.original_values.def"
diff --git a/definitions/grib2/template.5.42.def b/definitions/grib2/template.5.42.def
index 1f8abb2b2..401966908 100644
--- a/definitions/grib2/template.5.42.def
+++ b/definitions/grib2/template.5.42.def
@@ -2,8 +2,8 @@
 
 # TEMPLATE 5.42, Grid point data - CCSDS recommended lossless compression
 
-include "grib2/template.5.packing.def";
-include "grib2/template.5.original_values.def";
+include "grib2/template.5.packing.def"
+include "grib2/template.5.original_values.def"
 
 unsigned[1] ccsdsFlags : dump;
 alias ccsdsCompressionOptionsMask=ccsdsFlags;
diff --git a/definitions/grib2/template.5.50.def b/definitions/grib2/template.5.50.def
index 9c63c39dd..ab444b3ec 100644
--- a/definitions/grib2/template.5.50.def
+++ b/definitions/grib2/template.5.50.def
@@ -1,7 +1,7 @@
 # (C) Copyright 2005- ECMWF.
 
 # TEMPLATE 5.50, Spectral data - simple packing
-include "grib2/template.5.packing.def";
+include "grib2/template.5.packing.def"
 
 # Real part of (0,0)
-ieeefloat realPartOf00 ;
+ieeefloat realPartOf00;
diff --git a/definitions/grib2/template.5.50000.def b/definitions/grib2/template.5.50000.def
index be9894cbf..19c5b14da 100644
--- a/definitions/grib2/template.5.50000.def
+++ b/definitions/grib2/template.5.50000.def
@@ -1,8 +1,8 @@
 # (C) Copyright 2005- ECMWF.
 
-# TEMPLATE 5.50000, Spherical harmonics data - complex packing ( IEEE )
+# TEMPLATE 5.50000, Spherical harmonics data - complex packing (IEEE)
 
-include "grib2/template.5.packing.def";
+include "grib2/template.5.packing.def"
 
 if (gribex_mode_on()) {
   transient computeLaplacianOperator=0 : hidden;
diff --git a/definitions/grib2/template.5.51.def b/definitions/grib2/template.5.51.def
index d8db34ed9..f7dc292ca 100644
--- a/definitions/grib2/template.5.51.def
+++ b/definitions/grib2/template.5.51.def
@@ -2,7 +2,7 @@
 
 # TEMPLATE 5.51, Spherical harmonics data - complex packing
 
-include "grib2/template.5.packing.def";
+include "grib2/template.5.packing.def"
 
 if (gribex_mode_on()) {
   transient computeLaplacianOperator=0 : hidden;
diff --git a/definitions/grib2/template.5.53.def b/definitions/grib2/template.5.53.def
index 7921851ce..c7b21de5f 100644
--- a/definitions/grib2/template.5.53.def
+++ b/definitions/grib2/template.5.53.def
@@ -3,7 +3,7 @@
 # TEMPLATE 5.53, BiFourier coefficients data - complex packing
 # Spectral data for limited area models - complex packing
 
-include "grib2/template.5.packing.def";
+include "grib2/template.5.packing.def"
 
 transient computeLaplacianOperator=1 : hidden;
 
diff --git a/definitions/grib2/template.5.61.def b/definitions/grib2/template.5.61.def
index 1077f1f97..9c8e73a9e 100644
--- a/definitions/grib2/template.5.61.def
+++ b/definitions/grib2/template.5.61.def
@@ -6,6 +6,6 @@
 # This template is experimental, was not validated at the time of publication and should be used only for bilateral previously agreed tests
 constant typeOfPreProcessing = 1;
 
-include "grib2/template.5.packing.def";
+include "grib2/template.5.packing.def"
 
-ieeefloat preProcessingParameter  : read_only;
+ieeefloat preProcessingParameter : read_only;