diff --git a/lib/qcd/action/fermion/ShamirZolotarevFermion.h b/lib/qcd/action/fermion/ShamirZolotarevFermion.h
index f9397911..54463a9f 100644
--- a/lib/qcd/action/fermion/ShamirZolotarevFermion.h
+++ b/lib/qcd/action/fermion/ShamirZolotarevFermion.h
@@ -1,4 +1,4 @@
-    /*************************************************************************************
+/*************************************************************************************
 
     Grid physics library, www.github.com/paboyle/Grid 
 
@@ -24,46 +24,43 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
     See the full license in the file "LICENSE" in the top level distribution directory
-    *************************************************************************************/
-    /*  END LEGAL */
+*************************************************************************************/
+/*  END LEGAL */
 #ifndef  GRID_QCD_SHAMIR_ZOLOTAREV_FERMION_H
 #define  GRID_QCD_SHAMIR_ZOLOTAREV_FERMION_H
 
 #include <Grid/qcd/action/fermion/FermionCore.h>
 
-namespace Grid {
+NAMESPACE_BEGIN(Grid);
 
-  namespace QCD {
+template<class Impl>
+class ShamirZolotarevFermion : public MobiusZolotarevFermion<Impl>
+{
+public:
+  INHERIT_IMPL_TYPES(Impl);
 
-    template<class Impl>
-    class ShamirZolotarevFermion : public MobiusZolotarevFermion<Impl>
-    {
-    public:
-     INHERIT_IMPL_TYPES(Impl);
-
-      // Constructors
+  // Constructors
 
 
-    ShamirZolotarevFermion(GaugeField &_Umu,
-			   GridCartesian         &FiveDimGrid,
-			   GridRedBlackCartesian &FiveDimRedBlackGrid,
-			   GridCartesian         &FourDimGrid,
-			   GridRedBlackCartesian &FourDimRedBlackGrid,
-			   RealD _mass,RealD _M5,
-			   RealD lo, RealD hi,const ImplParams &p= ImplParams()) : 
+  ShamirZolotarevFermion(GaugeField &_Umu,
+			 GridCartesian         &FiveDimGrid,
+			 GridRedBlackCartesian &FiveDimRedBlackGrid,
+			 GridCartesian         &FourDimGrid,
+			 GridRedBlackCartesian &FourDimRedBlackGrid,
+			 RealD _mass,RealD _M5,
+			 RealD lo, RealD hi,const ImplParams &p= ImplParams()) : 
       
-      // b+c = 1; b-c = 1 => b=1, c=0
-      MobiusZolotarevFermion<Impl>(_Umu,
-				   FiveDimGrid,
-				   FiveDimRedBlackGrid,
-				   FourDimGrid,
-				   FourDimRedBlackGrid,_mass,_M5,1.0,0.0,lo,hi,p)
+    // b+c = 1; b-c = 1 => b=1, c=0
+    MobiusZolotarevFermion<Impl>(_Umu,
+				 FiveDimGrid,
+				 FiveDimRedBlackGrid,
+				 FourDimGrid,
+				 FourDimRedBlackGrid,_mass,_M5,1.0,0.0,lo,hi,p)
       
-      {}
+  {}
 
-    };
+};
 
-  }
-}
+NAMESPACE_END(Grid);
 
 #endif