diff --git a/sammy/src/ang/mang0.f b/sammy/src/ang/mang0.f
index 874b7187afbb1812788792f2206e39ad70630163..386cededc659bed30bf6d5a136a6992167bee496 100644
--- a/sammy/src/ang/mang0.f
+++ b/sammy/src/ang/mang0.f
@@ -12,7 +12,7 @@ C
       use lbro_common_m, only : Debug
       use AuxGridHelper_M, only : getNumAuxGridPoints
       use rsl7_m, only : Set_Kws
-      use mxct27_m      
+      use mxct27_m
       IMPLICIT none
       real(kind=8),allocatable,dimension(:)::A_Icccll
       real(kind=8),allocatable,dimension(:)::A_Ipoly
diff --git a/sammy/src/fgm/mfgm0.f90 b/sammy/src/fgm/mfgm0.f90
index a98333f4e1ec1077c1e2f7fe1961aa9a4074fede..78f68fd1ef920583d6becce257194a3564eedf26 100644
--- a/sammy/src/fgm/mfgm0.f90
+++ b/sammy/src/fgm/mfgm0.f90
@@ -53,6 +53,6 @@ subroutine Samfgm_broaden(this)
 ! *** Dopfgm PERFORMS DOPPLER BROADENING OPERATION
       CALL Dopfgm(   this,    A_Idpiso , I_Iflmsc, this%Brdlim)
 !
-      END subroutine
+END subroutine
 end module Samfgm_m
 
diff --git a/sammy/src/inp/minp06.f b/sammy/src/inp/minp06.f
index 7cbbcd7a6252b299b88ae1b4116060e150553d89..277f4aede7c05154b71a11cf6a94e5dbd49cd98f 100644
--- a/sammy/src/inp/minp06.f
+++ b/sammy/src/inp/minp06.f
@@ -440,7 +440,7 @@ C
 C        IF (using HEGA = High-Energy-Gaussian-Approximation to free gas
 C           model) then cannot broaden low energy points
          Xm = Zero         
-C ***    changed from 4.0d0 June 1997
+C ***    Brdlim changed from 4.0d0 to 5.0d0 June 1997
          IF (Dopple.NE.Zero) Xm = (2.0d0*Brdlim*Dopple)**2
          IF (Maxwel.NE.1 .AND. Nolowb.EQ.0 .AND. E1.LT.Xm) THEN
             WRITE (06,11100) Xm
diff --git a/sammy/src/salmon/tests/SammyGridAccessTest.cpp b/sammy/src/salmon/tests/SammyGridAccessTest.cpp
index 86ed0b83876004877640fc02983590e74bd2bd92..2a5e412b00da965c9bf40f3e3c5c85e93981ec16 100644
--- a/sammy/src/salmon/tests/SammyGridAccessTest.cpp
+++ b/sammy/src/salmon/tests/SammyGridAccessTest.cpp
@@ -24,7 +24,7 @@ void addTestData(sammy::GridDataList & list, int numcro = 1, int ktzero = 0, boo
         double e = i + 1;
         for ( int j = 0; j < nn; j++){
             double cro = j + 0.5;                
-            double data = e+ cro + 0.2;            
+            double data = e+ cro + 0.2;
 
             grid->addData(ipos,0, e);
             idat = 1;
@@ -59,7 +59,7 @@ void addTestData(sammy::GridDataList & list, int numcro = 1, int ktzero = 0, boo
             double cro = j + 10.5;           
             double data = cro + 10.2;
             grid->addData(ipos,0, e);
-            if ( numcro > 1){                              
+            if ( numcro > 1){
                 grid->addData(ipos, 1 , cro + e);
                 grid->addData(ipos, 2 , data + e);
             }