diff --git a/lib/qcd/action/fermion/WilsonTMFermion.h b/lib/qcd/action/fermion/WilsonTMFermion.h
index f75c287b..bb76aab1 100644
--- a/lib/qcd/action/fermion/WilsonTMFermion.h
+++ b/lib/qcd/action/fermion/WilsonTMFermion.h
@@ -1,4 +1,4 @@
-    /*************************************************************************************
+/*************************************************************************************
 
     Grid physics library, www.github.com/paboyle/Grid 
 
@@ -23,55 +23,53 @@ Author: paboyle <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_WILSON_TM_FERMION_H
 #define  GRID_QCD_WILSON_TM_FERMION_H
 
 #include <Grid/qcd/action/fermion/FermionCore.h>
 #include <Grid/qcd/action/fermion/WilsonFermion.h>
 
-namespace Grid {
+NAMESPACE_BEGIN(Grid);
 
-  namespace QCD {
+template<class Impl>
+class WilsonTMFermion : public WilsonFermion<Impl>
+{
+public:
+  INHERIT_IMPL_TYPES(Impl);
+public:
 
-    template<class Impl>
-    class WilsonTMFermion : public WilsonFermion<Impl>
-    {
-    public:
-      INHERIT_IMPL_TYPES(Impl);
-    public:
+  virtual void   Instantiatable(void) {};
+  // Constructors
+  WilsonTMFermion(GaugeField &_Umu,
+		  GridCartesian         &Fgrid,
+		  GridRedBlackCartesian &Hgrid, 
+		  RealD _mass,
+		  RealD _mu,
+		  const ImplParams &p= ImplParams()
+		  ) :
+    WilsonFermion<Impl>(_Umu,
+			Fgrid,
+			Hgrid,
+			_mass,p)
 
-      virtual void   Instantiatable(void) {};
-      // Constructors
-      WilsonTMFermion(GaugeField &_Umu,
-		    GridCartesian         &Fgrid,
-		    GridRedBlackCartesian &Hgrid, 
-		    RealD _mass,
-		    RealD _mu,
-		    const ImplParams &p= ImplParams()
-		      ) :
-	WilsonFermion<Impl>(_Umu,
-			    Fgrid,
-			    Hgrid,
-			    _mass,p)
-
-      {
-	mu = _mu;
-      }
+  {
+    mu = _mu;
+  }
 
 
-    // allow override for twisted mass and clover
-    virtual void Mooee(const FermionField &in, FermionField &out) ;
-    virtual void MooeeDag(const FermionField &in, FermionField &out) ;
-    virtual void MooeeInv(const FermionField &in, FermionField &out) ;
-    virtual void MooeeInvDag(const FermionField &in, FermionField &out) ;
+  // allow override for twisted mass and clover
+  virtual void Mooee(const FermionField &in, FermionField &out) ;
+  virtual void MooeeDag(const FermionField &in, FermionField &out) ;
+  virtual void MooeeInv(const FermionField &in, FermionField &out) ;
+  virtual void MooeeInvDag(const FermionField &in, FermionField &out) ;
 
-  private:
-     RealD mu; // TwistedMass parameter
+private:
+  RealD mu; // TwistedMass parameter
 
-  };
+};
 
-}}
+NAMESPACE_END(Grid);
 
 #endif