diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index a6a3865ba1..70adc771b1 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -178,10 +178,7 @@ const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
 
 template<class ParcelType>
 template<class TrackData>
-bool Foam::KinematicParcel<ParcelType>::move
-(
-    TrackData& td
-)
+bool Foam::KinematicParcel<ParcelType>::move(TrackData& td)
 {
     ParcelType& p = static_cast<ParcelType&>(*this);
 
@@ -289,19 +286,12 @@ void Foam::KinematicParcel<ParcelType>::hitPatch
 
 
 template<class ParcelType>
-void Foam::KinematicParcel<ParcelType>::hitPatch
-(
-    const polyPatch&,
-    int&
-)
+void Foam::KinematicParcel<ParcelType>::hitPatch(const polyPatch&, int&)
 {}
 
 
 template<class ParcelType>
-void Foam::KinematicParcel<ParcelType>::transformProperties
-(
-    const tensor& T
-)
+void Foam::KinematicParcel<ParcelType>::transformProperties(const tensor& T)
 {
     Particle<ParcelType>::transformProperties(T);
     U_ = transform(T, U_);
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
index 3787cf69ac..f405b9c54e 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
@@ -54,8 +54,10 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of classes
 class polynomial;
 
+// Forward declaration of friend functions
 Ostream& operator<<
 (
     Ostream&,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
index c239a281ba..5a41d3f39e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
@@ -60,12 +60,12 @@ bool Foam::NoDispersion<CloudType>::active() const
 template<class CloudType>
 Foam::vector Foam::NoDispersion<CloudType>::update
 (
-    const scalar dt,
-    const label celli,
-    const vector& U,
+    const scalar,
+    const label,
+    const vector&,
     const vector& Uc,
-    vector& UTurb,
-    scalar& tTurb
+    vector&,
+    scalar&
 )
 {
     // Do nothing
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C
index 31ce20689c..2d1586c9cb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C
@@ -29,11 +29,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::NoDrag<CloudType>::NoDrag
-(
-    const dictionary& dict,
-    CloudType& owner
-)
+Foam::NoDrag<CloudType>::NoDrag(const dictionary& dict, CloudType& owner)
 :
     DragModel<CloudType>(dict, owner)
 {}
@@ -56,10 +52,7 @@ bool Foam::NoDrag<CloudType>::active() const
 
 
 template<class CloudType>
-Foam::scalar Foam::NoDrag<CloudType>::Cd
-(
-    const scalar
-) const
+Foam::scalar Foam::NoDrag<CloudType>::Cd(const scalar) const
 {
     return 0.0;
 }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C
index c535410383..e5c76c5416 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C
@@ -56,10 +56,7 @@ bool Foam::SphereDrag<CloudType>::active() const
 
 
 template <class CloudType>
-Foam::scalar Foam::SphereDrag<CloudType>::Cd
-(
-    const scalar Re
-) const
+Foam::scalar Foam::SphereDrag<CloudType>::Cd(const scalar Re) const
 {
     scalar Cd;
     if (Re < SMALL)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 167e0937f8..a812eb9189 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -231,4 +231,5 @@ bool Foam::ConeInjection<CloudType>::validInjection(const label parcelI)
     return true;
 }
 
+
 // ************************************************************************* //