diff --git a/src/conversion/vtk/adaptor/foamVtkTools.H b/src/conversion/vtk/adaptor/foamVtkTools.H
index 4636c7af716be7a756692d24009f0447fdb3036f..3d35938abf657d024aefd00f20175b2160080808 100644
--- a/src/conversion/vtk/adaptor/foamVtkTools.H
+++ b/src/conversion/vtk/adaptor/foamVtkTools.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2017-2018 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2017-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -280,9 +280,11 @@ namespace Tools
 };
 
 
+// Specializations
+
 //- Template specialization for symmTensor ordering
 template<>
-inline void Foam::vtk::Tools::remapTuple<Foam::symmTensor>(float data[])
+inline void Tools::remapTuple<Foam::symmTensor>(float data[])
 {
     std::swap(data[1], data[3]);    // swap XY <-> YY
     std::swap(data[2], data[5]);    // swap XZ <-> ZZ
@@ -291,7 +293,7 @@ inline void Foam::vtk::Tools::remapTuple<Foam::symmTensor>(float data[])
 
 //- Template specialization for symmTensor ordering
 template<>
-inline void Foam::vtk::Tools::remapTuple<Foam::symmTensor>(double data[])
+inline void Tools::remapTuple<Foam::symmTensor>(double data[])
 {
     std::swap(data[1], data[3]);    // swap XY <-> YY
     std::swap(data[2], data[5]);    // swap XZ <-> ZZ
@@ -303,6 +305,7 @@ inline void Foam::vtk::Tools::remapTuple<Foam::symmTensor>(double data[])
 } // End namespace vtk
 } // End namespace Foam
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "foamVtkToolsI.H"
diff --git a/src/conversion/vtk/adaptor/foamVtkToolsTemplates.C b/src/conversion/vtk/adaptor/foamVtkToolsTemplates.C
index 49f64b43e126ddea06b96fff9aff56a970d2ce8b..ce7abd026a2cc97fee51e9bf97fd4404671cbbb5 100644
--- a/src/conversion/vtk/adaptor/foamVtkToolsTemplates.C
+++ b/src/conversion/vtk/adaptor/foamVtkToolsTemplates.C
@@ -21,22 +21,19 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-InClass
+InNamespace
     Foam::vtk::Tools
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef foamVtkToolsTemplates_C
-#define foamVtkToolsTemplates_C
-
 // OpenFOAM includes
 #include "error.H"
 
 // VTK includes
-#include <vtkFloatArray.h>
-#include <vtkCellData.h>
-#include <vtkPointData.h>
-#include <vtkSmartPointer.h>
+#include "vtkFloatArray.h"
+#include "vtkCellData.h"
+#include "vtkPointData.h"
+#include "vtkSmartPointer.h"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,9 +49,9 @@ Foam::vtk::Tools::Patch::points(const PatchType& p)
     vtkpoints->SetNumberOfPoints(pts.size());
 
     vtkIdType pointId = 0;
-    for (const point& p : pts)
+    for (const point& pt : pts)
     {
-        vtkpoints->SetPoint(pointId++, p.v_);
+        vtkpoints->SetPoint(pointId++, pt.v_);
     }
 
     return vtkpoints;
@@ -258,8 +255,4 @@ Foam::vtk::Tools::convertFieldToVTK
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
 // ************************************************************************* //