diff --git a/definitions/bufr/boot_edition_1.def b/definitions/bufr/boot_edition_1.def
index bbf700062..1949309bd 100644
--- a/definitions/bufr/boot_edition_1.def
+++ b/definitions/bufr/boot_edition_1.def
@@ -1,6 +1,6 @@
 # (C) Copyright 2005- ECMWF.
 
-ascii[4] identifier  = "BUFR" : read_only,hidden;
+ascii[4] identifier = "BUFR" : read_only,hidden;
 alias identifier=identifier;
 
 unsigned[3] section1Length;
@@ -8,7 +8,7 @@ unsigned[3] section1Length;
 unsigned[1] edition = 1 : dump;
 alias editionNumber=edition;
 
-template    section_1 "bufr/section.1.1.def";
+template section_1 "bufr/section.1.1.def";
 
 flagbit localSectionPresent(section1Flags,7) = 1;
 alias section2Present=localSectionPresent;
@@ -18,7 +18,7 @@ if(localSectionPresent){
    template section_2 "bufr/section.2.def";
 }
 else {
-	transient section2Length = 0;
+   transient section2Length = 0;
 }
 
 template section_3 "bufr/section.3.def";
diff --git a/definitions/bufr/boot_edition_2.def b/definitions/bufr/boot_edition_2.def
index 88ccefaf1..bfa052117 100644
--- a/definitions/bufr/boot_edition_2.def
+++ b/definitions/bufr/boot_edition_2.def
@@ -1,24 +1,24 @@
 # (C) Copyright 2005- ECMWF.
 
-ascii[4] identifier  = "BUFR" : read_only,hidden;
+ascii[4] identifier = "BUFR" : read_only,hidden;
 alias identifier=identifier;
 
-unsigned[3]   totalLength;
+unsigned[3] totalLength;
 
 unsigned[1] edition = 2 : dump;
 alias editionNumber=edition;
 
-template    section_1 "bufr/section.1.2.def";
+template section_1 "bufr/section.1.2.def";
 
 flagbit localSectionPresent(section1Flags,7) = 1;
 alias section2Present=localSectionPresent;
 alias localUsePresent=localSectionPresent;
 
 if(localSectionPresent){
-   template section_2 "bufr/section.2.def";
+  template section_2 "bufr/section.2.def";
 }
 else {
-	transient section2Length = 0;
+  transient section2Length = 0;
 }
 
 template section_3 "bufr/section.3.def";
diff --git a/definitions/bufr/boot_edition_3.def b/definitions/bufr/boot_edition_3.def
index a05dd8ea9..a34ab4b7f 100644
--- a/definitions/bufr/boot_edition_3.def
+++ b/definitions/bufr/boot_edition_3.def
@@ -1,9 +1,9 @@
 # (C) Copyright 2005- ECMWF.
 
-ascii[4] identifier  = "BUFR" : read_only,hidden;
+ascii[4] identifier = "BUFR" : read_only,hidden;
 alias identifier=identifier;
 
-section_length[3]   totalLength ;
+section_length[3] totalLength ;
 
 unsigned[1] edition = 3 : dump;
 alias editionNumber=edition;
@@ -15,10 +15,10 @@ alias section2Present=localSectionPresent;
 alias localUsePresent=localSectionPresent;
 
 if(localSectionPresent){
-   template section_2 "bufr/section.2.def";
+  template section_2 "bufr/section.2.def";
 }
 else {
-	transient section2Length = 0;
+  transient section2Length = 0;
 }
 
 template section_3 "bufr/section.3.def";
diff --git a/definitions/bufr/boot_edition_4.def b/definitions/bufr/boot_edition_4.def
index 0f8fa73ac..63d6f6430 100644
--- a/definitions/bufr/boot_edition_4.def
+++ b/definitions/bufr/boot_edition_4.def
@@ -1,23 +1,23 @@
 # (C) Copyright 2005- ECMWF.
 
-ascii[4] identifier  = "BUFR" : read_only,hidden;
+ascii[4] identifier = "BUFR" : read_only,hidden;
 alias identifier=identifier;
 
-section_length[3]   totalLength ;
+section_length[3] totalLength ;
 
 unsigned[1] edition = 4 : dump;
 alias editionNumber=edition;
 
-template    section_1 "bufr/section.1.4.def";
+template section_1 "bufr/section.1.4.def";
 
 flagbit localSectionPresent(section1Flags,7) = 1;
 alias section2Present=localSectionPresent;
 alias localUsePresent=localSectionPresent;
 
 if(localSectionPresent){
-   template section_2 "bufr/section.2.def";
+  template section_2 "bufr/section.2.def";
 } else {
-   transient section2Length = 0;
+  transient section2Length = 0;
 }
 
 template section_3 "bufr/section.3.def";