diff --git a/lib/lattice/Lattice_conformable.h b/lib/lattice/Lattice_conformable.h
index 398b3c90..1ddc9038 100644
--- a/lib/lattice/Lattice_conformable.h
+++ b/lib/lattice/Lattice_conformable.h
@@ -1,4 +1,4 @@
-    /*************************************************************************************
+/*************************************************************************************
 
     Grid physics library, www.github.com/paboyle/Grid 
 
@@ -23,18 +23,18 @@ 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_CONFORMABLE_H
 #define GRID_LATTICE_CONFORMABLE_H
 
-namespace Grid {
-
-    template<class obj1,class obj2> void conformable(const Lattice<obj1> &lhs,const Lattice<obj2> &rhs)
-    {
-        assert(lhs._grid == rhs._grid);
-        assert(lhs.checkerboard == rhs.checkerboard);
-    }
+NAMESPACE_BEGIN(Grid);
 
+template<class obj1,class obj2> void conformable(const Lattice<obj1> &lhs,const Lattice<obj2> &rhs)
+{
+  assert(lhs._grid == rhs._grid);
+  assert(lhs.checkerboard == rhs.checkerboard);
 }
+
+NAMESPACE_END(Grid);
 #endif