diff --git a/applications/solvers/cfdemSolverPiso/UEqn.H b/applications/solvers/cfdemSolverPiso/UEqn.H
index bfc3121d..2f26ac91 100644
--- a/applications/solvers/cfdemSolverPiso/UEqn.H
+++ b/applications/solvers/cfdemSolverPiso/UEqn.H
@@ -15,10 +15,10 @@ fvOptions.constrain(UEqn);
 if (piso.momentumPredictor() && (modelType=="B" || modelType=="Bfull"))
 {
     solve(UEqn == - fvc::grad(p) + Ksl/rho*Us);
-    fvOptions.correct(U);		    
+    fvOptions.correct(U);
 }
 else if (piso.momentumPredictor())
 {
     solve(UEqn == - voidfraction*fvc::grad(p) + Ksl/rho*Us);
     fvOptions.correct(U);
-}
\ No newline at end of file
+}
diff --git a/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C b/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
index 8f1a8534..78c425c7 100644
--- a/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
+++ b/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C
@@ -86,12 +86,12 @@ int main(int argc, char *argv[])
         Ksl = particleCloud.momCoupleM(0).impMomSource();
         Ksl.correctBoundaryConditions();
 
-       //Force Checks
-       vector fTotal(0,0,0);
-       vector fImpTotal = sum(mesh.V()*Ksl.internalField()*(Us.internalField()-U.internalField())).value();
-       reduce(fImpTotal, sumOp<vector>());
-       Info << "TotalForceExp: " << fTotal << endl;
-       Info << "TotalForceImp: " << fImpTotal << endl;
+        //Force Checks
+        vector fTotal(0,0,0);
+        vector fImpTotal = sum(mesh.V()*Ksl.internalField()*(Us.internalField()-U.internalField())).value();
+        reduce(fImpTotal, sumOp<vector>());
+        Info << "TotalForceExp: " << fTotal << endl;
+        Info << "TotalForceImp: " << fImpTotal << endl;
 
         #include "solverDebugInfo.H"
         particleCloud.clockM().stop("Coupling");
diff --git a/applications/solvers/cfdemSolverPiso/createFields.H b/applications/solvers/cfdemSolverPiso/createFields.H
index 8f0b5584..36246301 100644
--- a/applications/solvers/cfdemSolverPiso/createFields.H
+++ b/applications/solvers/cfdemSolverPiso/createFields.H
@@ -96,17 +96,17 @@
 #define createPhi_H
 Info<< "Reading/calculating face flux field phi\n" << endl;
 surfaceScalarField phi
- (
-     IOobject
-     (
+(
+    IOobject
+    (
         "phi",
         runTime.timeName(),
          mesh,
         IOobject::READ_IF_PRESENT,
         IOobject::AUTO_WRITE
-     ),
-     linearInterpolate(U*voidfraction) & mesh.Sf()
- );
+    ),
+    linearInterpolate(U*voidfraction) & mesh.Sf()
+);
 #endif
 
 
@@ -123,4 +123,4 @@ surfaceScalarField phi
         incompressible::turbulenceModel::New(U, phi, laminarTransport)
     );
 
-#include "createMRF.H"
\ No newline at end of file
+#include "createMRF.H"
diff --git a/applications/solvers/cfdemSolverPiso/pEqn.H b/applications/solvers/cfdemSolverPiso/pEqn.H
index 96ca1d77..c50eb9e3 100644
--- a/applications/solvers/cfdemSolverPiso/pEqn.H
+++ b/applications/solvers/cfdemSolverPiso/pEqn.H
@@ -31,12 +31,12 @@ constrainPressure(p, Uvoidfraction, phiHbyA, rAUvoidfraction, MRF);
 while (piso.correctNonOrthogonal())
 {
     // Pressure corrector
-  
+
     fvScalarMatrix pEqn
     (
         fvm::laplacian(rAUvoidfraction, p) == fvc::div(phi) + particleCloud.ddtVoidfraction()
     );
-    
+
     pEqn.setReference(pRefCell, pRefValue);
 
     pEqn.solve(mesh.solver(p.select(piso.finalInnerIter())));
@@ -55,4 +55,4 @@ else
     U = HbyA - voidfraction*rAU*fvc::grad(p) + Ksl/rho*Us*rAU;
 
 U.correctBoundaryConditions();
-fvOptions.correct(U);
\ No newline at end of file
+fvOptions.correct(U);
diff --git a/applications/solvers/cfdemSolverPisoScalar/TEqn.H b/applications/solvers/cfdemSolverPisoScalar/TEqn.H
index 6513b654..772b7838 100644
--- a/applications/solvers/cfdemSolverPisoScalar/TEqn.H
+++ b/applications/solvers/cfdemSolverPisoScalar/TEqn.H
@@ -1,4 +1,4 @@
- // get scalar source from DEM        
+ // get scalar source from DEM
         particleCloud.forceM(1).manipulateScalarField(Tsource);
         Tsource.correctBoundaryConditions();
 
@@ -12,4 +12,4 @@
            Tsource
         );
         TEqn.relax();
-        TEqn.solve();
\ No newline at end of file
+        TEqn.solve();
diff --git a/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C b/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C
index 9fc59b59..5f511cdf 100644
--- a/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C
+++ b/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C
@@ -81,23 +81,23 @@ int main(int argc, char *argv[])
         {
             particleCloud.smoothingM().smoothen(particleCloud.forceM(0).impParticleForces());
         }
-    
+
         Info << "update Ksl.internalField()" << endl;
         Ksl = particleCloud.momCoupleM(0).impMomSource();
         Ksl.correctBoundaryConditions();
 
-       //Force Checks
-       vector fTotal(0,0,0);
-       vector fImpTotal = sum(mesh.V()*Ksl.internalField()*(Us.internalField()-U.internalField())).value();
-       reduce(fImpTotal, sumOp<vector>());
-       Info << "TotalForceExp: " << fTotal << endl;
-       Info << "TotalForceImp: " << fImpTotal << endl;
+        //Force Checks
+        vector fTotal(0,0,0);
+        vector fImpTotal = sum(mesh.V()*Ksl.internalField()*(Us.internalField()-U.internalField())).value();
+        reduce(fImpTotal, sumOp<vector>());
+        Info << "TotalForceExp: " << fTotal << endl;
+        Info << "TotalForceImp: " << fImpTotal << endl;
 
         #include "solverDebugInfo.H"
         particleCloud.clockM().stop("Coupling");
 
         particleCloud.clockM().start(26,"Flow");
-	
+
         #include "TEqn.H"
 
         if(particleCloud.solveFlow())
diff --git a/applications/solvers/cfdemSolverPisoScalar/createFields.H b/applications/solvers/cfdemSolverPisoScalar/createFields.H
index fe5dd29a..f7779bec 100644
--- a/applications/solvers/cfdemSolverPisoScalar/createFields.H
+++ b/applications/solvers/cfdemSolverPisoScalar/createFields.H
@@ -146,17 +146,17 @@
 #define createPhi_H
 Info<< "Reading/calculating face flux field phi\n" << endl;
 surfaceScalarField phi
- (
-     IOobject
-     (
+(
+    IOobject
+    (
         "phi",
         runTime.timeName(),
          mesh,
         IOobject::READ_IF_PRESENT,
         IOobject::AUTO_WRITE
-     ),
-     linearInterpolate(U*voidfraction) & mesh.Sf()
- );
+    ),
+    linearInterpolate(U*voidfraction) & mesh.Sf()
+);
 #endif
 
 
@@ -173,4 +173,4 @@ surfaceScalarField phi
         incompressible::turbulenceModel::New(U, phi, laminarTransport)
     );
 
-#include "createMRF.H"
\ No newline at end of file
+#include "createMRF.H"
diff --git a/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C b/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C
index 39fa85cc..eb4d2c47 100644
--- a/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C
+++ b/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C
@@ -69,8 +69,8 @@ int main(int argc, char *argv[])
     #include "checkModelType.H"
 
     turbulence->validate();
-  //        #include "compressibleCourantNo.H"
-  //  #include "setInitialDeltaT.H"
+    //#include "compressibleCourantNo.H"
+    //#include "setInitialDeltaT.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/cfdemSolverRhoPimple/pEqn.H b/applications/solvers/cfdemSolverRhoPimple/pEqn.H
index 40c68619..e107c5a4 100644
--- a/applications/solvers/cfdemSolverRhoPimple/pEqn.H
+++ b/applications/solvers/cfdemSolverRhoPimple/pEqn.H
@@ -32,7 +32,7 @@ else
     //      + rhorAUf*fvc::ddtCorr(rho, U, phi)
         )
     );
-    
+
     // flux without pressure gradient contribution
     phi = phiHbyA + phiUs;
 
diff --git a/applications/solvers/cfdemSolverRhoPimple/rhoEqn.H b/applications/solvers/cfdemSolverRhoPimple/rhoEqn.H
index 3be6fb2b..620e16c2 100644
--- a/applications/solvers/cfdemSolverRhoPimple/rhoEqn.H
+++ b/applications/solvers/cfdemSolverRhoPimple/rhoEqn.H
@@ -14,4 +14,4 @@
     fvOptions.correct(rho);
 }
 
-// ************************************************************************* //
\ No newline at end of file
+// ************************************************************************* //
diff --git a/applications/solvers/cfdemSolverRhoSimple/EEqn.H b/applications/solvers/cfdemSolverRhoSimple/EEqn.H
index 53630bfb..930f66e2 100644
--- a/applications/solvers/cfdemSolverRhoSimple/EEqn.H
+++ b/applications/solvers/cfdemSolverRhoSimple/EEqn.H
@@ -6,13 +6,13 @@
     particleCloud.energyContributions(Qsource);
     particleCloud.energyCoefficients(QCoeff);
 
-    //thDiff=particleCloud.thermCondM().thermDiff();   
-    thCond=particleCloud.thermCondM().thermCond(); 
+    //thDiff=particleCloud.thermCondM().thermDiff();
+    thCond=particleCloud.thermCondM().thermCond();
 
-    addSource = 
+    addSource =
         (
             he.name() == "e"
-          ? 
+          ?
             fvc::div(phi, K) +
             fvc::div
             (
diff --git a/applications/solvers/cfdemSolverRhoSimple/pEqn.H b/applications/solvers/cfdemSolverRhoSimple/pEqn.H
index 5b2dbcbd..ed546344 100644
--- a/applications/solvers/cfdemSolverRhoSimple/pEqn.H
+++ b/applications/solvers/cfdemSolverRhoSimple/pEqn.H
@@ -27,7 +27,7 @@ else
             fvc::flux(rhoeps*HbyA)
         )
     );
-    
+
     // flux without pressure gradient contribution
     phi = phiHbyA + phiUs;
 
@@ -78,4 +78,4 @@ else
 
 U.correctBoundaryConditions();
 fvOptions.correct(U);
-K = 0.5*magSqr(U);
\ No newline at end of file
+K = 0.5*magSqr(U);
diff --git a/applications/utilities/cfdemPostproc/cfdemPostproc.C b/applications/utilities/cfdemPostproc/cfdemPostproc.C
index a832bacc..1f46b1de 100644
--- a/applications/utilities/cfdemPostproc/cfdemPostproc.C
+++ b/applications/utilities/cfdemPostproc/cfdemPostproc.C
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
     particleCloud.dataExchangeM().allocateArray(particleV_,0.,1);
     particleCloud.get_cellIDs(cellIDs_);  // get ref to cellIDs
     //particleCloud.dataExchangeM().allocateArray(cellIDs_,0.,1);
-    
+
 
     while (runTime.loop())
     {
diff --git a/applications/utilities/writeUfluid/writeUfluid.C b/applications/utilities/writeUfluid/writeUfluid.C
index cde6c88f..a6a84121 100644
--- a/applications/utilities/writeUfluid/writeUfluid.C
+++ b/applications/utilities/writeUfluid/writeUfluid.C
@@ -28,7 +28,7 @@ Application
     writeUfluidwriteUfluid
 
 Description
-    Writes the the cell center fluid velocity to particles in the lagrangian 
+    Writes the the cell center fluid velocity to particles in the lagrangian
     time directory.
 \*---------------------------------------------------------------------------*/
 
@@ -76,13 +76,13 @@ int nParticle=0;
     {
         volVectorField U(UHeader,mesh);
         passiveParticleCloud myCloud(mesh, cloudName);
-		myCloud.write();
+        myCloud.write();
         nParticle = myCloud.size();
-	    IOField<vector> Ufluid(myCloud.fieldIOobject("Ufluid",IOobject::NO_READ),nParticle);
+        IOField<vector> Ufluid(myCloud.fieldIOobject("Ufluid",IOobject::NO_READ),nParticle);
         label i = 0;
         forAllConstIter(passiveParticleCloud, myCloud, iter)
         {
-		    Ufluid[i]=U[iter().cell()];
+            Ufluid[i]=U[iter().cell()];
             i++;
         }
         Ufluid.write();