diff --git a/src/MOLECULE/fix_cmap.cpp b/src/MOLECULE/fix_cmap.cpp
index eedb9bf554a8612edfbeafb5dd9366a65b16d184..da7d337b9bc604afe3f60012ab7d9a9825c5ab39 100644
--- a/src/MOLECULE/fix_cmap.cpp
+++ b/src/MOLECULE/fix_cmap.cpp
@@ -12,20 +12,20 @@
 ------------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------
-   Implementation of the CHARMM CMAP; adds an extra energy term for the
-   peptide backbone dihedrals.  The tools/ch2lmp/charmm2lammps.pl
-   conversion script, which generates an extra section in the LAMMPS data
-   file, is needed in order to generate the info used by this fix style.
-
    Contributing authors:
    Xiaohu Hu, CMB/ORNL (hux2@ornl.gov)
    David Hyde-Volpe, Tigran Abramyan, and Robert A. Latour (Clemson University)
    Chris Lorenz (Kings College-London)
 
+   Implementation of the CHARMM CMAP; adds an extra energy term for the
+   peptide backbone dihedrals.  The tools/ch2lmp/charmm2lammps.pl
+   conversion script, which generates an extra section in the LAMMPS data
+   file, is needed in order to generate the info used by this fix style.
+
    References:
    - MacKerell et al., J. Am. Chem. Soc. 126(2004):698-699.
    - MacKerell et al., J. Comput. Chem. 25(2004):1400-1415.
- -------------------------------------------------------------------------*/
+------------------------------------------------------------------------- */
 
 #include <mpi.h>
 #include <math.h>
diff --git a/src/USER-CG-CMM/angle_sdk.cpp b/src/USER-CG-CMM/angle_sdk.cpp
index cc54985991008fccc7ec04081f45931a7df745b4..a4f979961f2e3cdc6b91a9b42103427a088a4ec9 100644
--- a/src/USER-CG-CMM/angle_sdk.cpp
+++ b/src/USER-CG-CMM/angle_sdk.cpp
@@ -12,9 +12,10 @@
 ------------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------
+   Contributing author: Axel Kohlmeyer (Temple U)
+
    Variant of the harmonic angle potential for use with the
    lj/sdk potential for coarse grained MD simulations.
-   Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
 #include <math.h>
diff --git a/src/USER-COLVARS/ndx_group.cpp b/src/USER-COLVARS/ndx_group.cpp
index 10ccf000b6910bc4dc550b64efacaed4ae03ef03..31d8332c9c7dec4cc12b092ac6b5aa9f22797750 100644
--- a/src/USER-COLVARS/ndx_group.cpp
+++ b/src/USER-COLVARS/ndx_group.cpp
@@ -10,8 +10,9 @@
 
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
+
 /* ----------------------------------------------------------------------
-   Contributing author:  Axel Kohlmeyer (Temple U)
+   Contributing author: Axel Kohlmeyer (Temple U)
 ------------------------------------------------------------------------- */
 
 #include "ndx_group.h"
diff --git a/src/USER-EFF/fix_nh_eff.cpp b/src/USER-EFF/fix_nh_eff.cpp
index bbf5ac31f051de5841806ab81a8f12e600be00c2..464498969ebf6ff0a23ba335e9f0842e1dc4f364 100644
--- a/src/USER-EFF/fix_nh_eff.cpp
+++ b/src/USER-EFF/fix_nh_eff.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------
- Contributing author: Andres Jaramillo-Botero (Caltech)
+   Contributing author: Andres Jaramillo-Botero (Caltech)
 ------------------------------------------------------------------------- */
 
 #include <math.h>
diff --git a/src/USER-H5MD/dump_h5md.cpp b/src/USER-H5MD/dump_h5md.cpp
index ba31c22d26b8bc19ef1fbaa5d77bdb839507bbdb..7456d6fa446dc261da14e6f76b23faf1f6aacc19 100644
--- a/src/USER-H5MD/dump_h5md.cpp
+++ b/src/USER-H5MD/dump_h5md.cpp
@@ -9,6 +9,9 @@
    the GNU General Public License.
 
    See the README file in the top-level LAMMPS directory.
+------------------------------------------------------------------------- */
+
+/* ----------------------------------------------------------------------
    Contributing author: Pierre de Buyl (KU Leuven)
 ------------------------------------------------------------------------- */
 
diff --git a/src/USER-MISC/fix_ti_spring.cpp b/src/USER-MISC/fix_ti_spring.cpp
index 6b9e3d63b596ea09c6d25884e08fc8c9fe04d046..fbbc747c38c91a88efaa148b5e723707a5a6a994 100644
--- a/src/USER-MISC/fix_ti_spring.cpp
+++ b/src/USER-MISC/fix_ti_spring.cpp
@@ -12,7 +12,7 @@
 ------------------------------------------------------------------------- */
 
 /* -------------------------------------------------------------------------
-    Contributing authors:
+   Contributing authors:
              Rodrigo Freitas (UC Berkeley) - rodrigof@berkeley.edu
              Mark Asta (UC Berkeley) - mdasta@berkeley.edu
              Maurice de Koning (Unicamp/Brazil) - dekoning@ifi.unicamp.br
diff --git a/src/USER-OMP/fix_omp.cpp b/src/USER-OMP/fix_omp.cpp
index 20e60bab26924717e0b108f4488587e699814624..b3fe2c29e8635669382b785d491201b236c0928f 100644
--- a/src/USER-OMP/fix_omp.cpp
+++ b/src/USER-OMP/fix_omp.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------
-   OpenMP based threading support for LAMMPS
    Contributing author: Axel Kohlmeyer (Temple U)
+   OpenMP based threading support for LAMMPS
 ------------------------------------------------------------------------- */
 
 #include "atom.h"
diff --git a/src/USER-OMP/pppm_disp_omp.cpp b/src/USER-OMP/pppm_disp_omp.cpp
index 277da9d4b3851c62b2a504b4b7d5e569df613657..16d3001ddf725ff9c5fb075aae5ac697a5b2a063 100644
--- a/src/USER-OMP/pppm_disp_omp.cpp
+++ b/src/USER-OMP/pppm_disp_omp.cpp
@@ -12,7 +12,8 @@
 ------------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------
-   Contributing author: Axel Kohlmeyer (Temple U), Rolf Isele-Holder (RWTH Aachen University)
+   Contributing authors: Axel Kohlmeyer (Temple U)
+                         Rolf Isele-Holder (RWTH Aachen University)
 ------------------------------------------------------------------------- */
 
 #include "pppm_disp_omp.h"
diff --git a/src/USER-OMP/thr_data.cpp b/src/USER-OMP/thr_data.cpp
index cc184d9d6745c8a2d0922808e457deca32b69b0f..0e9eafb2f58886df226a80e5b3e23fd1c0d2c966 100644
--- a/src/USER-OMP/thr_data.cpp
+++ b/src/USER-OMP/thr_data.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------
-   per-thread data management for LAMMPS
    Contributing author: Axel Kohlmeyer (Temple U)
+   per-thread data management for LAMMPS
 ------------------------------------------------------------------------- */
 
 #include "thr_data.h"
diff --git a/src/USER-OMP/thr_omp.cpp b/src/USER-OMP/thr_omp.cpp
index 1aba7290a25ccc29f112ea0f311a45ca6d7fe327..1744a773873429569f9e3c9cddd5b2277520068a 100644
--- a/src/USER-OMP/thr_omp.cpp
+++ b/src/USER-OMP/thr_omp.cpp
@@ -12,8 +12,8 @@
 ------------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------
-   OpenMP based threading support for LAMMPS
    Contributing author: Axel Kohlmeyer (Temple U)
+   OpenMP based threading support for LAMMPS
 ------------------------------------------------------------------------- */
 
 #include "atom.h"
diff --git a/src/USER-PHONON/fix_phonon.cpp b/src/USER-PHONON/fix_phonon.cpp
index 1470bc3eef75ebd511700e55040e4f94028a74fd..e4ff1dd31c815cb372b8b555b59cd5c6c90eb240 100644
--- a/src/USER-PHONON/fix_phonon.cpp
+++ b/src/USER-PHONON/fix_phonon.cpp
@@ -10,9 +10,9 @@
 
    See the README file in the top-level LAMMPS directory.
 ------------------------------------------------------------------------- */
+
 /* ----------------------------------------------------------------------
-   Contributing authors:
-     Ling-Ti Kong
+   Contributing author: Ling-Ti Kong
 
    Contact:
      School of Materials Science and Engineering,
diff --git a/src/USER-SMD/fix_smd_wall_surface.cpp b/src/USER-SMD/fix_smd_wall_surface.cpp
index 08272342653848501e7574a1fb2115211482b024..94cac6e20c6750f734f2e7d0854cc5bdb91052d9 100644
--- a/src/USER-SMD/fix_smd_wall_surface.cpp
+++ b/src/USER-SMD/fix_smd_wall_surface.cpp
@@ -12,8 +12,8 @@
  ------------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------
- Contributing authors: Mike Parks (SNL), Ezwanur Rahman, J.T. Foster (UTSA)
- ------------------------------------------------------------------------- */
+   Contributing authors: Mike Parks (SNL), Ezwanur Rahman, J.T. Foster (UTSA)
+------------------------------------------------------------------------- */
 
 #include <math.h>
 #include "fix_smd_wall_surface.h"
diff --git a/src/USER-SMD/pair_smd_hertz.cpp b/src/USER-SMD/pair_smd_hertz.cpp
index 3c7d7cffb9012139f7f526b7a421da35863a9fb5..76143d6395b282915f2e6c600a373f8a0d6c7473 100644
--- a/src/USER-SMD/pair_smd_hertz.cpp
+++ b/src/USER-SMD/pair_smd_hertz.cpp
@@ -23,8 +23,8 @@
  ------------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------
- Contributing author: Mike Parks (SNL)
- ------------------------------------------------------------------------- */
+   Contributing author: Mike Parks (SNL)
+------------------------------------------------------------------------- */
 
 #include <math.h>
 #include <float.h>
diff --git a/src/USER-SMD/pair_smd_triangulated_surface.cpp b/src/USER-SMD/pair_smd_triangulated_surface.cpp
index 8410f2ec05d62e8a6949f851fa27385854df7e2f..b4e63dd11de8e206ea8ec4574ea51e3c81a8941c 100644
--- a/src/USER-SMD/pair_smd_triangulated_surface.cpp
+++ b/src/USER-SMD/pair_smd_triangulated_surface.cpp
@@ -23,8 +23,8 @@
  ------------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------
- Contributing author: Mike Parks (SNL)
- ------------------------------------------------------------------------- */
+   Contributing author: Mike Parks (SNL)
+------------------------------------------------------------------------- */
 
 #include <math.h>
 #include <float.h>