diff --git a/lib/lattice/Lattice_local.h b/lib/lattice/Lattice_local.h
index 9dae1cd9..97e118f0 100644
--- a/lib/lattice/Lattice_local.h
+++ b/lib/lattice/Lattice_local.h
@@ -1,4 +1,4 @@
-    /*************************************************************************************
+/*************************************************************************************
 
     Grid physics library, www.github.com/paboyle/Grid 
 
@@ -23,8 +23,8 @@ 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_LATTICE_LOCALREDUCTION_H
 #define GRID_LATTICE_LOCALREDUCTION_H
 
@@ -32,44 +32,44 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 // localInner, localNorm, outerProduct
 ///////////////////////////////////////////////
 
-namespace Grid {
+NAMESPACE_BEGIN(Grid);
 
-  /////////////////////////////////////////////////////
-  // Non site, reduced locally reduced routines
-  /////////////////////////////////////////////////////
+/////////////////////////////////////////////////////
+// Non site, reduced locally reduced routines
+/////////////////////////////////////////////////////
   
-  // localNorm2,
-  template<class vobj>
-    inline auto localNorm2 (const Lattice<vobj> &rhs)-> Lattice<typename vobj::tensor_reduced>
-    {
-      Lattice<typename vobj::tensor_reduced> ret(rhs._grid);
-      parallel_for(int ss=0;ss<rhs._grid->oSites(); ss++){
-	ret._odata[ss]=innerProduct(rhs._odata[ss],rhs._odata[ss]);
-      }
-      return ret;
-    }
-  
-  // localInnerProduct
-  template<class vobj>
-    inline auto localInnerProduct (const Lattice<vobj> &lhs,const Lattice<vobj> &rhs) -> Lattice<typename vobj::tensor_reduced>
-    {
-      Lattice<typename vobj::tensor_reduced> ret(rhs._grid);
-      parallel_for(int ss=0;ss<rhs._grid->oSites(); ss++){
-	ret._odata[ss]=innerProduct(lhs._odata[ss],rhs._odata[ss]);
-      }
-      return ret;
-    }
-  
-  // outerProduct Scalar x Scalar -> Scalar
-  //              Vector x Vector -> Matrix
-  template<class ll,class rr>
-    inline auto outerProduct (const Lattice<ll> &lhs,const Lattice<rr> &rhs) -> Lattice<decltype(outerProduct(lhs._odata[0],rhs._odata[0]))>
-  {
-    Lattice<decltype(outerProduct(lhs._odata[0],rhs._odata[0]))> ret(rhs._grid);
-    parallel_for(int ss=0;ss<rhs._grid->oSites(); ss++){
-      ret._odata[ss]=outerProduct(lhs._odata[ss],rhs._odata[ss]);
-    }
-    return ret;
+// localNorm2,
+template<class vobj>
+inline auto localNorm2 (const Lattice<vobj> &rhs)-> Lattice<typename vobj::tensor_reduced>
+{
+  Lattice<typename vobj::tensor_reduced> ret(rhs._grid);
+  parallel_for(int ss=0;ss<rhs._grid->oSites(); ss++){
+    ret._odata[ss]=innerProduct(rhs._odata[ss],rhs._odata[ss]);
   }
+  return ret;
 }
+  
+// localInnerProduct
+template<class vobj>
+inline auto localInnerProduct (const Lattice<vobj> &lhs,const Lattice<vobj> &rhs) -> Lattice<typename vobj::tensor_reduced>
+{
+  Lattice<typename vobj::tensor_reduced> ret(rhs._grid);
+  parallel_for(int ss=0;ss<rhs._grid->oSites(); ss++){
+    ret._odata[ss]=innerProduct(lhs._odata[ss],rhs._odata[ss]);
+  }
+  return ret;
+}
+  
+// outerProduct Scalar x Scalar -> Scalar
+//              Vector x Vector -> Matrix
+template<class ll,class rr>
+inline auto outerProduct (const Lattice<ll> &lhs,const Lattice<rr> &rhs) -> Lattice<decltype(outerProduct(lhs._odata[0],rhs._odata[0]))>
+{
+  Lattice<decltype(outerProduct(lhs._odata[0],rhs._odata[0]))> ret(rhs._grid);
+  parallel_for(int ss=0;ss<rhs._grid->oSites(); ss++){
+    ret._odata[ss]=outerProduct(lhs._odata[ss],rhs._odata[ss]);
+  }
+  return ret;
+}
+NAMESPACE_END(Grid);
 #endif