diff --git a/sammy/src/blk/Broad_common.f90 b/sammy/src/blk/Broad_common.f90
index d7e3fc8afd9b4674ab563f29ce40377fea28f991..53a9c7e0ec958cb06a717f8c880bcef70db1d64d 100644
--- a/sammy/src/blk/Broad_common.f90
+++ b/sammy/src/blk/Broad_common.f90
@@ -68,10 +68,10 @@ module broad_common_m
 contains
 
 subroutine DopplerBroadenInfo_setDopple(this)
-class(DopplerBroadenInfo)::this
-if (associated(this%highEnergyFreeGas)) then
-   this%highEnergyFreeGas%Dopple = Dopple
-end if
+    class(DopplerBroadenInfo)::this
+    if (associated(this%highEnergyFreeGas)) then
+        this%highEnergyFreeGas%Dopple = Dopple
+    end if
 
 end subroutine
 end module broad_common_m
diff --git a/sammy/src/clm/CrystalLatticeBroadening_M.f90 b/sammy/src/clm/CrystalLatticeBroadening_M.f90
index fe48d47b708f15af5d472706b2aed9bb349e66d1..f16185d0a879c552c47ed491a226274618ed92ce 100644
--- a/sammy/src/clm/CrystalLatticeBroadening_M.f90
+++ b/sammy/src/clm/CrystalLatticeBroadening_M.f90
@@ -31,7 +31,7 @@ integer :: N_Contin = 0
 integer :: N_Osc = 0
 integer :: Nbeta = 0
 integer :: Nbx = 0
-integer :: Nbeta_Max = 25999
+integer, parameter :: Nbeta_Max = 25999
 
 real(kind=8):: Aaawww
 
diff --git a/sammy/src/clm/dopush3.f b/sammy/src/clm/dopush3.f
index 961e22abe8afbad3a812676b10921c60eee8608b..3b48d09b1889a7e43c3fb16192bce847983290bf 100644
--- a/sammy/src/clm/dopush3.f
+++ b/sammy/src/clm/dopush3.f
@@ -43,7 +43,7 @@ C     SCATTERING LaW CALCULATION
 C     Ei is in eV; Beta is unitless
 C
 C
-	ix=0       
+	ix=0
 C *** Continuous part of distribution
       call allocate_real_data(calc%Sab, calc%Nbeta)
       CALL Cconti (calc, Alpha, Norm, Sumr)
diff --git a/sammy/src/cro/mcro5.f90 b/sammy/src/cro/mcro5.f90
index be30a79d65b408bb8530e2dcbe41b5914655b2ed..ffeeb1852f572caaf4561bb0532f184c2c0f9029 100644
--- a/sammy/src/cro/mcro5.f90
+++ b/sammy/src/cro/mcro5.f90
@@ -49,24 +49,24 @@ contains
    end subroutine normAndBack
 
    subroutine normAfterAng(moreBroadening, needIsos, broadener)
-   use DerivativeHandler_M
-   use DopplerAndResolutionBroadener_M
-   use SumIsoAndConvertToTrans_M
-   use array_sizes_common_m, only : calcData, calcDataSelf
-   use ifwrit_m, only : Kcros
-   use fixedi_m, only : numUsedPar
-   use, intrinsic :: ISO_C_BINDING
-   implicit none
-   logical(C_BOOL)::moreBroadening, needIsos
-   class(DopplerAndResolutionBroadener)::broadener
-
-   type(SumIsoAndConvertToTrans)::summer
-
-   call summer%initialize(broadener, calcDataSelf, Kcros.eq.8)
-   summer%Need_Isotopes= needIsos
-   summer%Another_Process_Will_Happen=moreBroadening
-   call summer%angPostProcessing(numUsedPar)
-   call summer%destroy
+       use DerivativeHandler_M
+       use DopplerAndResolutionBroadener_M
+       use SumIsoAndConvertToTrans_M
+       use array_sizes_common_m, only : calcData, calcDataSelf
+       use ifwrit_m, only : Kcros
+       use fixedi_m, only : numUsedPar
+       use, intrinsic :: ISO_C_BINDING
+       implicit none
+       logical(C_BOOL)::moreBroadening, needIsos
+       class(DopplerAndResolutionBroadener)::broadener
+
+       type(SumIsoAndConvertToTrans)::summer
+
+       call summer%initialize(broadener, calcDataSelf, Kcros.eq.8)
+       summer%Need_Isotopes= needIsos
+       summer%Another_Process_Will_Happen=moreBroadening
+       call summer%angPostProcessing(numUsedPar)
+       call summer%destroy
    end subroutine normAfterAng
 end module sumAndConvertAfterBroadening_m