diff --git a/definitions/grib1/mars_labeling.82.def b/definitions/grib1/mars_labeling.82.def
index ffd419df0..576d26f72 100644
--- a/definitions/grib1/mars_labeling.82.def
+++ b/definitions/grib1/mars_labeling.82.def
@@ -1,17 +1,14 @@
 #########################
-#
 # author: Sebastien Villaume (SMHI)
 # created: 6 Oct 2011
 # modified: 13 Sep 2013
 #
 #########################
-
 constant conceptsMasterMarsDir="mars" : hidden;
 constant conceptsLocalMarsDirAll="mars/[centre:s]" : hidden;
 
 # Base MARS keywors
 ##########################
-
 alias mars.class   = marsClass;
 alias mars.type   = marsType;
 alias mars.stream = marsStream;
@@ -21,7 +18,6 @@ alias mars.domain = globalDomain;
 
 # local section 82
 #########################
-
 ### nothing needed here...
 
 # Local section 83
diff --git a/definitions/grib2/template.3.gaussian.def b/definitions/grib2/template.3.gaussian.def
index b41399654..8db26647b 100755
--- a/definitions/grib2/template.3.gaussian.def
+++ b/definitions/grib2/template.3.gaussian.def
@@ -26,11 +26,11 @@ meta g2grid g2grid(
     subdivisionsOfBasicAngle
     );
 
-meta      geography.latitudeOfFirstGridPointInDegrees    g2latlon(g2grid,0) : dump;
-meta      geography.longitudeOfFirstGridPointInDegrees   g2latlon(g2grid,1) : dump;
-meta      geography.latitudeOfLastGridPointInDegrees     g2latlon(g2grid,2) : dump;
-meta      geography.longitudeOfLastGridPointInDegrees    g2latlon(g2grid,3) : dump;
-meta      geography.iDirectionIncrementInDegrees         g2latlon(g2grid,4,iDirectionIncrementGiven) : can_be_missing,dump;
+meta geography.latitudeOfFirstGridPointInDegrees    g2latlon(g2grid,0) : dump;
+meta geography.longitudeOfFirstGridPointInDegrees   g2latlon(g2grid,1) : dump;
+meta geography.latitudeOfLastGridPointInDegrees     g2latlon(g2grid,2) : dump;
+meta geography.longitudeOfLastGridPointInDegrees    g2latlon(g2grid,3) : dump;
+meta geography.iDirectionIncrementInDegrees         g2latlon(g2grid,4,iDirectionIncrementGiven) : can_be_missing,dump;
 
 meta global global_gaussian(N,Ni,iDirectionIncrement,
                             latitudeOfFirstGridPoint,
diff --git a/definitions/grib2/template.5.1.def b/definitions/grib2/template.5.1.def
index d41ce6403..e01b7f3e4 100644
--- a/definitions/grib2/template.5.1.def
+++ b/definitions/grib2/template.5.1.def
@@ -16,7 +16,7 @@ unsigned[4] numberOfCodedValues;
 # NR - first dimension (rows)
 unsigned[2] firstDimension;
 
-alias NR  = firstDimension;
+alias NR = firstDimension;
 # NC - second dimension (columns)
 unsigned[2] secondDimension;
 
@@ -47,12 +47,12 @@ ieeefloat coefsSecond[NC2]; # TODO: find proper names
 alias data.coefsFirst = coefsFirst;
 alias data.coefsSecond=coefsSecond;
 
-if(matrixBitmapsPresent == 1) {
+if (matrixBitmapsPresent == 1) {
   constant datumSize             = NC*NR;
   constant secondaryBitmapsCount = numberOfValues + 0;
   constant secondaryBitmapsSize  = secondaryBitmapsCount/8;
 
-  transient numberOfDataMatrices  = numberOfDataPoints/datumSize;
+  transient numberOfDataMatrices = numberOfDataPoints/datumSize;
 
   position offsetBBitmap;
   meta secondaryBitmaps g2bitmap(
@@ -63,7 +63,7 @@ if(matrixBitmapsPresent == 1) {
           numberOfCodedValues ,
           dummy) : read_only;
 
-  meta bitmap  data_g2secondary_bitmap(primaryBitmap,
+  meta bitmap data_g2secondary_bitmap(primaryBitmap,
       secondaryBitmaps,
       missingValue,datumSize,numberOfDataPoints) : read_only;
 }
diff --git a/src/grib_loader_from_file.c b/src/deprecated/grib_loader_from_file.c
similarity index 100%
rename from src/grib_loader_from_file.c
rename to src/deprecated/grib_loader_from_file.c