diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
index c87faab832..9e54abe4ad 100644
--- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
+++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C
@@ -73,7 +73,7 @@ void icoPolynomial<PolySize>::write(Ostream& os) const
         rhoCoeffs_/this->W()
     );
 
-    os  << dict.dictName() << nl << dict;
+    os  << indent << dict.dictName() << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressible/incompressible.C b/src/thermophysicalModels/specie/equationOfState/incompressible/incompressible.C
index c9a0b81989..6aed730366 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressible/incompressible.C
+++ b/src/thermophysicalModels/specie/equationOfState/incompressible/incompressible.C
@@ -53,7 +53,7 @@ void Foam::incompressible::write(Ostream& os) const
     dictionary dict("equationOfState");
     dict.add("rho", rho_);
 
-    os  << dict.dictName() << nl << dict;
+    os  << indent << dict.dictName() << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/specie/specie.C b/src/thermophysicalModels/specie/specie/specie.C
index 6ae423bf2e..2b84c05580 100644
--- a/src/thermophysicalModels/specie/specie/specie.C
+++ b/src/thermophysicalModels/specie/specie/specie.C
@@ -66,7 +66,7 @@ void Foam::specie::write(Ostream& os) const
     dictionary dict("specie");
     dict.add("nMoles", nMoles_);
     dict.add("molWeight", molWeight_);
-    os  << dict.dictName() << nl << dict;
+    os  << indent << dict.dictName() << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
index cd36e3d6aa..38a0d8f0b5 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
@@ -58,7 +58,7 @@ void Foam::eConstThermo<EquationOfState>::write(Ostream& os) const
     dictionary dict("thermodynamics");
     dict.add("Cv", Cv_);
     dict.add("Hf", Hf_);
-    os  << dict.dictName() << nl << dict;
+    os  << indent << dict.dictName() << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
index ca3ee834a2..5631755c6f 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
@@ -58,7 +58,7 @@ void Foam::hConstThermo<equationOfState>::write(Ostream& os) const
     dictionary dict("thermodynamics");
     dict.add("Cp", Cp_);
     dict.add("Hf", Hf_);
-    os  << dict.dictName() << nl << dict;
+    os  << indent << dict.dictName() << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
index 7de0696cf5..b5dfe01481 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
@@ -108,7 +108,7 @@ void Foam::hPolynomialThermo<EquationOfState, PolySize>::write
         word("CpCoeffs<" + Foam::name(PolySize) + '>'),
         CpCoeffs_/this->W()
     );
-    os  << dict.dictName() << nl << dict;
+    os  << indent << dict.dictName() << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
index f254236c47..4bc263f79b 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
@@ -108,7 +108,7 @@ void Foam::janafThermo<EquationOfState>::write(Ostream& os) const
     dict.add("Tcommon", Tcommon_);
     dict.add("highCpCoeffs", highCpCoeffs_);
     dict.add("lowCpCoeffs", lowCpCoeffs_);
-    os  << dict.dictName() << nl << dict;
+    os  << indent << dict.dictName() << dict;
 }
 
 
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.C b/src/thermophysicalModels/specie/transport/const/constTransport.C
index 5ec86a7d3b..fb0aaed3fc 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.C
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.C
@@ -61,7 +61,7 @@ void Foam::constTransport<Thermo>::constTransport::write(Ostream& os) const
     dictionary dict("transport");
     dict.add("mu", mu_);
     dict.add("Pr", 1.0/rPr_);
-    os  << dict.dictName() << nl << dict;
+    os  << indent << dict.dictName() << dict;
 
     os  << decrIndent << token::END_BLOCK << nl;
 }
diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
index b67a72d890..8376683c07 100644
--- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
+++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C
@@ -88,7 +88,7 @@ void Foam::polynomialTransport<Thermo, PolySize>::write(Ostream& os) const
         word("kappaCoeffs<" + Foam::name(PolySize) + '>'),
         kappaCoeffs_/this->W()
     );
-    os  << dict.dictName() << nl << dict;
+    os  << indent << dict.dictName() << dict;
 
     os  << decrIndent << token::END_BLOCK << nl;
 }
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
index 08b270acea..4aab3494e8 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
@@ -61,7 +61,7 @@ void Foam::sutherlandTransport<Thermo>::write(Ostream& os) const
     dictionary dict("transport");
     dict.add("As", As_);
     dict.add("Ts", Ts_);
-    os  << dict.dictName() << nl << dict;
+    os  << indent << dict.dictName() << dict;
 
     os  << decrIndent << token::END_BLOCK << nl;
 }
@@ -71,7 +71,8 @@ void Foam::sutherlandTransport<Thermo>::write(Ostream& os) const
 template<class Thermo>
 Foam::Ostream& Foam::operator<<
 (
-    Ostream& os, const sutherlandTransport<Thermo>& st
+    Ostream& os,
+    const sutherlandTransport<Thermo>& st
 )
 {
     os << static_cast<const Thermo&>(st) << tab << st.As_ << tab << st.Ts_;