diff --git a/definitions/budg/boot.def b/definitions/budg/boot.def
index bea61a75d..05c2cfdbe 100644
--- a/definitions/budg/boot.def
+++ b/definitions/budg/boot.def
@@ -11,18 +11,17 @@ position startOfHeaders;
 ascii[4]      identifier;
 
 alias ls.identifier=identifier;
-transient     missingValue = 9999;
+transient missingValue = 9999;
 constant ieeeFloats = 0: edition_specific;
 constant zero=0:hidden;
 
-template      section1 "budg/section.1.def";
-template      mars_labeling "budg/mars_labeling.def";
-template      section4 "budg/section.4.def";
-ascii[4]      endMark;
-position      totalLength;
-
+template section1 "budg/section.1.def";
+template mars_labeling "budg/mars_labeling.def";
+template section4 "budg/section.4.def";
+ascii[4] endMark;
+position totalLength;
 
 # This needs to be there for the MARS server, so the totalLength is processed correctly
-position      endOfHeadersMarker;
+position endOfHeadersMarker;
 meta lengthOfHeaders evaluate( endOfHeadersMarker-startOfHeaders);
 meta md5Headers md5(startOfHeaders,lengthOfHeaders);
diff --git a/definitions/budg/section.1.def b/definitions/budg/section.1.def
index d70384543..c6d92a328 100644
--- a/definitions/budg/section.1.def
+++ b/definitions/budg/section.1.def
@@ -20,8 +20,6 @@ codetable[1] indicatorOfTypeOfLevel 'grib1/3.table';
 codetable[2] heightPressureEtcOfLevels 'grib1/3.table';
 alias ls.levelType=indicatorOfTypeOfLevel;
 
-#  Year of century
-# NOTE 6 NOT FOUND
 unsigned[1] yearOfCentury ;
 
 unsigned[1] month ;
@@ -39,14 +37,12 @@ meta julianDay julian_day(dataDate,hour,minute,second) : edition_specific;
 #  Indicator of unit of time range
 codetable[1] indicatorOfUnitOfTimeRange 'grib1/4.table';
 
-#  P1 - Period of time
-# (number of time units)
+#  P1 - Period of time (number of time units)
 unsigned[1] periodOfTime ;
 
 alias P1 = periodOfTime ;
 
-#  P2 - Period of time
-# (number of time units)
+#  P2 - Period of time (number of time units)
 unsigned[1] periodOfTimeIntervals ;
 
 alias P2 = periodOfTimeIntervals ;
diff --git a/definitions/budg/section.4.def b/definitions/budg/section.4.def
index 5f57a1fbe..347182d3f 100644
--- a/definitions/budg/section.4.def
+++ b/definitions/budg/section.4.def
@@ -44,7 +44,7 @@ if (numberOfChars >= 12) {
 
   alias expver=experimentVersionNumber;
   alias marsExpver=experimentVersionNumber;
-    
+
   constant numberOfRemaininChars  = numberOfChars - 12;
 
   charValues list(numberOfRemaininChars) {
diff --git a/definitions/tide/section.1.def b/definitions/tide/section.1.def
index 2aa5d2b1a..c26b84ccc 100644
--- a/definitions/tide/section.1.def
+++ b/definitions/tide/section.1.def
@@ -1,11 +1,4 @@
 # (C) Copyright 2005- ECMWF.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-# 
-# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
-# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
-#
 
 section_length[3] section1Length ;
 unsigned[1] gribTablesVersionNo ;
@@ -24,33 +17,18 @@ codetable[1] indicatorOfTypeOfLevel 'grib1/3.table' : string_type,edition_specif
 alias ls.levelType = indicatorOfTypeOfLevel;
 codetable[2] heightPressureEtcOfLevels 'grib1/3.table';
 
-#  Year of century
-# NOTE 6 NOT FOUND
-unsigned[1] yearOfCentury ;
-
-#  Month
-unsigned[1] month ;
-
-#  Day
+unsigned[1] yearOfCentury;
+unsigned[1] month;
 unsigned[1] day;
+unsigned[1] hour;
+unsigned[1] minute;
 
-#  Hour
-unsigned[1] hour ;
-
-#  Minute
-unsigned[1] minute ;
-
-#  Indicator of unit of time range
 codetable[1] indicatorOfUnitOfTimeRange 'grib1/4.table';
 
-#  P1 - Period of time
-# (number of time units)
+#  P1 - Period of time (number of time units)
 unsigned[1] periodOfTime ;
 
-alias   P1  = periodOfTime ;
+alias P1 = periodOfTime ;
 
-#  P2 - Period of time
-# (number of time units)
+#  P2 - Period of time (number of time units)
 unsigned[1] periodOfTimeIntervals ;
-
-