diff --git a/src/OpenFOAM/global/profiling/profilingInformation.H b/src/OpenFOAM/global/profiling/profilingInformation.H
index 6a8ee2a7ab..1e19b06c2f 100644
--- a/src/OpenFOAM/global/profiling/profilingInformation.H
+++ b/src/OpenFOAM/global/profiling/profilingInformation.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2009-2016 Bernhard Gschaider
-     \\/     M anipulation  | Copyright (C) 2016-2107 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
diff --git a/src/conversion/vtk/output/foamVtkOutputFields.H b/src/conversion/vtk/output/foamVtkOutputFields.H
index 22f9a8d60f..9cd9766263 100644
--- a/src/conversion/vtk/output/foamVtkOutputFields.H
+++ b/src/conversion/vtk/output/foamVtkOutputFields.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2107 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C b/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
index b3852dad2b..74cb846a1b 100644
--- a/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
+++ b/src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2107 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/fileFormats/vtk/output/foamVtkOutput.H b/src/fileFormats/vtk/output/foamVtkOutput.H
index 0ad5f38488..4a71b5208d 100644
--- a/src/fileFormats/vtk/output/foamVtkOutput.H
+++ b/src/fileFormats/vtk/output/foamVtkOutput.H
@@ -59,9 +59,7 @@ namespace vtk
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-  // Constants
-
-  // General Functions
+// General Functions
 
     //- Return a default asciiFormatter
     autoPtr<vtk::formatter> newFormatter(std::ostream& os);
@@ -94,7 +92,7 @@ namespace vtk
     void writeList
     (
         vtk::formatter& fmt,
-        const UList<Type>& lst
+        const UList<Type>& list
     );
 
     //- Write a list of values.
@@ -103,7 +101,7 @@ namespace vtk
     void writeList
     (
         vtk::formatter& fmt,
-        const FixedList<Type, Size>& lst
+        const FixedList<Type, Size>& list
     );
 
 
@@ -113,7 +111,7 @@ namespace vtk
     void writeList
     (
         vtk::formatter& fmt,
-        const UList<Type>& lst,
+        const UList<Type>& list,
         const labelUList& addressing
     );
 
@@ -126,7 +124,7 @@ namespace vtk
 namespace legacy
 {
 
-  // Constants
+// Constants
 
     //- Strings corresponding to the (POLYDATA, UNSTRUCTURED_GRID) elements
     extern const Foam::Enum<vtk::fileTag> contentNames;
@@ -135,7 +133,7 @@ namespace legacy
     extern const Foam::Enum<vtk::fileTag> dataTypeNames;
 
 
-  // Functions
+// Functions
 
     //- Emit header for legacy file.
     //  Writes "ASCII" or "BINARY" depending on specified type.
diff --git a/src/fileFormats/vtk/output/foamVtkOutputTemplates.C b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
index 3cc030a3bc..7a398f8d9d 100644
--- a/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
+++ b/src/fileFormats/vtk/output/foamVtkOutputTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2107 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,12 +44,12 @@ template<class Type>
 void Foam::vtk::writeList
 (
     vtk::formatter& fmt,
-    const UList<Type>& lst
+    const UList<Type>& list
 )
 {
-    forAll(lst, i)
+    for (const Type& val : list)
     {
-        write(fmt, lst[i]);
+        write(fmt, val);
     }
 }
 
@@ -58,12 +58,12 @@ template<class Type, unsigned Size>
 void Foam::vtk::writeList
 (
     vtk::formatter& fmt,
-    const FixedList<Type, Size>& lst
+    const FixedList<Type, Size>& list
 )
 {
-    for (unsigned i=0; i<Size; ++i)
+    for (const Type& val : list)
     {
-        write(fmt, lst[i]);
+        write(fmt, val);
     }
 }
 
@@ -72,13 +72,13 @@ template<class Type>
 void Foam::vtk::writeList
 (
     vtk::formatter& fmt,
-    const UList<Type>& lst,
+    const UList<Type>& list,
     const labelUList& addressing
 )
 {
-    forAll(addressing, i)
+    for (const label idx : addressing)
     {
-        write(fmt, lst[addressing[i]]);
+        write(fmt, list[idx]);
     }
 }
 
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index d2d398d58e..7e376b2f14 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016-2107 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.