diff --git a/include/cantera/base/AnyMap.h b/include/cantera/base/AnyMap.h
index ac0d40abf..2718ac1a1 100644
--- a/include/cantera/base/AnyMap.h
+++ b/include/cantera/base/AnyMap.h
@@ -285,7 +285,7 @@ public:
     bool hasMapWhere(const string& key, const string& value) const;
 
     //! Return values used to determine the sort order when outputting to YAML
-    pair <int, int> order() const;
+    pair<int, int> order() const;
 
     //! See AnyMap::applyUnits()
     void applyUnits(shared_ptr<UnitSystem>& units);
diff --git a/include/cantera/base/ValueCache.h b/include/cantera/base/ValueCache.h
index 65b973c3c..33b1a8808 100644
--- a/include/cantera/base/ValueCache.h
+++ b/include/cantera/base/ValueCache.h
@@ -176,10 +176,10 @@ public:
 
 protected:
     //! Cached scalar values
-    map<int, CachedValue<double> > m_scalarCache;
+    map<int, CachedValue<double>> m_scalarCache;
 
     //! Cached array values
-    map<int, CachedValue<vector<double>> > m_arrayCache;
+    map<int, CachedValue<vector<double>>> m_arrayCache;
 
     //! The last assigned id. Automatically incremented by the getId() method.
     static int m_last_id;
diff --git a/include/cantera/equil/vcs_solve.h b/include/cantera/equil/vcs_solve.h
index af603eb0e..bcf90a35b 100644
--- a/include/cantera/equil/vcs_solve.h
+++ b/include/cantera/equil/vcs_solve.h
@@ -1451,7 +1451,7 @@ public:
     //! Charge of each species. Length = number of species.
     vector<double> m_chargeSpecies;
 
-    vector<vector<size_t> > phasePopProblemLists_;
+    vector<vector<size_t>> phasePopProblemLists_;
 
     //! Vector of pointers to thermo structures which identify the model
     //! and parameters for evaluating the thermodynamic functions for that
diff --git a/include/cantera/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h
index 55f43646d..057bbbef9 100644
--- a/include/cantera/kinetics/InterfaceKinetics.h
+++ b/include/cantera/kinetics/InterfaceKinetics.h
@@ -483,7 +483,7 @@ protected:
      *  m_rxnPhaseIsReactant[j][p] indicates whether a species in phase p
      *  participates in reaction j as a reactant.
      */
-    vector<vector<bool> > m_rxnPhaseIsReactant;
+    vector<vector<bool>> m_rxnPhaseIsReactant;
 
     //! Vector of vector of booleans indicating whether a phase participates in a
     //! reaction as a product
@@ -491,7 +491,7 @@ protected:
      *  m_rxnPhaseIsReactant[j][p] indicates whether a species in phase p
      *  participates in reaction j as a product.
      */
-    vector<vector<bool> > m_rxnPhaseIsProduct;
+    vector<vector<bool>> m_rxnPhaseIsProduct;
 
     int m_ioFlag = 0;
 
diff --git a/include/cantera/kinetics/Kinetics.h b/include/cantera/kinetics/Kinetics.h
index 1eeb2fbaa..9d8af48d1 100644
--- a/include/cantera/kinetics/Kinetics.h
+++ b/include/cantera/kinetics/Kinetics.h
@@ -1546,7 +1546,7 @@ protected:
     vector<double> m_perturb;
 
     //! Vector of Reaction objects represented by this Kinetics manager
-    vector<shared_ptr<Reaction> > m_reactions;
+    vector<shared_ptr<Reaction>> m_reactions;
 
     //! m_thermo is a vector of pointers to ThermoPhase objects that are
     //! involved with this kinetics operator
diff --git a/include/cantera/kinetics/ReactionPath.h b/include/cantera/kinetics/ReactionPath.h
index 7b0378b85..e5acd2b45 100644
--- a/include/cantera/kinetics/ReactionPath.h
+++ b/include/cantera/kinetics/ReactionPath.h
@@ -279,7 +279,7 @@ public:
 
 protected:
     double m_flxmax = 0.0;
-    map<size_t, map<size_t, Path*> > m_paths;
+    map<size_t, map<size_t, Path*>> m_paths;
 
     //! map of species index to SpeciesNode
     map<size_t, SpeciesNode*> m_nodes;
@@ -317,8 +317,8 @@ protected:
     vector<double> m_ropf;
     vector<double> m_ropr;
     vector<double> m_x;
-    vector<vector<size_t> > m_reac;
-    vector<vector<size_t> > m_prod;
+    vector<vector<size_t>> m_reac;
+    vector<vector<size_t>> m_prod;
     DenseMatrix m_elatoms;
     vector<vector<int>> m_groups;
     vector<Group> m_sgroup;
@@ -327,7 +327,7 @@ protected:
     //! m_transfer[reaction][reactant number][product number] where "reactant
     //! number" means the number of the reactant in the reaction equation. For example,
     //! for "A+B -> C+D", "B" is reactant number 1 and "C" is product number 0.
-    map<size_t, map<size_t, map<size_t, Group> > > m_transfer;
+    map<size_t, map<size_t, map<size_t, Group>>> m_transfer;
 
     vector<bool> m_determinate;
     Array2D m_atoms;
diff --git a/include/cantera/kinetics/ThirdBodyCalc.h b/include/cantera/kinetics/ThirdBodyCalc.h
index 2382f0878..8fccca9cd 100644
--- a/include/cantera/kinetics/ThirdBodyCalc.h
+++ b/include/cantera/kinetics/ThirdBodyCalc.h
@@ -136,7 +136,7 @@ protected:
     vector<size_t> m_no_mass_action_index;
 
     //! m_species[i][j] is the index of the j-th species in reaction i.
-    vector<vector<size_t> > m_species;
+    vector<vector<size_t>> m_species;
 
     //! m_eff[i][j] is the efficiency of the j-th species in reaction i.
     vector<vector<double>> m_eff;
diff --git a/include/cantera/thermo/MultiSpeciesThermo.h b/include/cantera/thermo/MultiSpeciesThermo.h
index 8c5fb81b7..b0c6e272c 100644
--- a/include/cantera/thermo/MultiSpeciesThermo.h
+++ b/include/cantera/thermo/MultiSpeciesThermo.h
@@ -199,8 +199,8 @@ protected:
     //! Mark species *k* as having its thermodynamic data installed
     void markInstalled(size_t k);
 
-    typedef pair<size_t, shared_ptr<SpeciesThermoInterpType> > index_STIT;
-    typedef map<int, vector<index_STIT> > STIT_map;
+    typedef pair<size_t, shared_ptr<SpeciesThermoInterpType>> index_STIT;
+    typedef map<int, vector<index_STIT>> STIT_map;
     typedef map<int, vector<double>> tpoly_map;
 
     //! This is the main data structure, which contains the
@@ -215,7 +215,7 @@ protected:
     //! Map from species index to location within #m_sp, such that
     //! `m_sp[m_speciesLoc[k].first][m_speciesLoc[k].second]` is the
     //! SpeciesThermoInterpType object for species `k`.
-    map<size_t, pair<int, size_t> > m_speciesLoc;
+    map<size_t, pair<int, size_t>> m_speciesLoc;
 
     //! Maximum value of the lowest temperature
     double m_tlow_max = 0.0;
diff --git a/include/cantera/thermo/Phase.h b/include/cantera/thermo/Phase.h
index feb6aa014..49a3b31bb 100644
--- a/include/cantera/thermo/Phase.h
+++ b/include/cantera/thermo/Phase.h
@@ -969,7 +969,7 @@ protected:
 
     vector<double> m_speciesCharge; //!< Vector of species charges. length m_kk.
 
-    map<string, shared_ptr<Species> > m_species;
+    map<string, shared_ptr<Species>> m_species;
 
     //! Flag determining behavior when adding species with an undefined element
     UndefElement::behavior m_undefinedElementBehavior = UndefElement::add;
diff --git a/src/equil/MultiPhaseEquil.cpp b/src/equil/MultiPhaseEquil.cpp
index 39a77b420..0cdf7a2bc 100644
--- a/src/equil/MultiPhaseEquil.cpp
+++ b/src/equil/MultiPhaseEquil.cpp
@@ -591,7 +591,7 @@ double MultiPhaseEquil::computeReactionSteps(vector<double>& dxi)
 void MultiPhaseEquil::computeN()
 {
     // Sort the list of species by mole fraction (decreasing order)
-    vector<pair<double, size_t> > moleFractions(m_nsp);
+    vector<pair<double, size_t>> moleFractions(m_nsp);
     for (size_t k = 0; k < m_nsp; k++) {
         // use -Xk to generate reversed sort order
         moleFractions[k] = {-m_mix->speciesMoles(m_species[k]), k};
diff --git a/src/kinetics/Kinetics.cpp b/src/kinetics/Kinetics.cpp
index 0e21dcc33..5710d69e3 100644
--- a/src/kinetics/Kinetics.cpp
+++ b/src/kinetics/Kinetics.cpp
@@ -107,8 +107,8 @@ void Kinetics::checkSpeciesArraySize(size_t kk) const
 pair<size_t, size_t> Kinetics::checkDuplicates(bool throw_err) const
 {
     //! Map of (key indicating participating species) to reaction numbers
-    map<size_t, vector<size_t> > participants;
-    vector<map<int, double> > net_stoich;
+    map<size_t, vector<size_t>> participants;
+    vector<map<int, double>> net_stoich;
     std::unordered_set<size_t> unmatched_duplicates;
     for (size_t i = 0; i < m_reactions.size(); i++) {
         if (m_reactions[i]->duplicate) {
diff --git a/src/kinetics/ReactionPath.cpp b/src/kinetics/ReactionPath.cpp
index 43146ac3f..37b11efc4 100644
--- a/src/kinetics/ReactionPath.cpp
+++ b/src/kinetics/ReactionPath.cpp
@@ -540,8 +540,8 @@ int ReactionPathBuilder::init(ostream& logfile, Kinetics& kin)
 
     // all reactants / products, even ones appearing on both sides of the
     // reaction
-    vector<vector<size_t> > allProducts(m_nr);
-    vector<vector<size_t> > allReactants(m_nr);
+    vector<vector<size_t>> allProducts(m_nr);
+    vector<vector<size_t>> allReactants(m_nr);
     for (size_t i = 0; i < m_nr; i++) {
         for (size_t k = 0; k < m_ns; k++) {
             for (int n = 0; n < kin.reactantStoichCoeff(k, i); n++) {
@@ -733,7 +733,7 @@ int ReactionPathBuilder::build(Kinetics& s, const string& element,
                         double f;
                         if ((m_atoms(kkp,m) < m_elatoms(m, i)) &&
                                 (m_atoms(kkr,m) < m_elatoms(m, i))) {
-                            map<size_t, map<size_t, Group> >& g = m_transfer[i];
+                            map<size_t, map<size_t, Group>>& g = m_transfer[i];
                             if (g.empty()) {
                                 if (!warn[i] && !quiet) {
                                     output << endl;
diff --git a/src/numerics/CVodesIntegrator.cpp b/src/numerics/CVodesIntegrator.cpp
index 4251328db..4f96f1883 100644
--- a/src/numerics/CVodesIntegrator.cpp
+++ b/src/numerics/CVodesIntegrator.cpp
@@ -660,7 +660,7 @@ string CVodesIntegrator::getErrorInfo(int N)
     CVodeGetErrWeights(m_cvode_mem, errw);
     CVodeGetEstLocalErrors(m_cvode_mem, errs);
 
-    vector<tuple<double, double, size_t> > weightedErrors;
+    vector<tuple<double, double, size_t>> weightedErrors;
     for (size_t i=0; i<m_neq; i++) {
         double err = NV_Ith_S(errs, i) * NV_Ith_S(errw, i);
         weightedErrors.emplace_back(-abs(err), err, i);
diff --git a/src/thermo/Species.cpp b/src/thermo/Species.cpp
index 44fcf3c3e..b46f8dfd0 100644
--- a/src/thermo/Species.cpp
+++ b/src/thermo/Species.cpp
@@ -142,7 +142,7 @@ unique_ptr<Species> newSpecies(const AnyMap& node)
 
 vector<shared_ptr<Species>> getSpecies(const AnyValue& items)
 {
-    vector<shared_ptr<Species> > all_species;
+    vector<shared_ptr<Species>> all_species;
     for (const auto& node : items.asVector<AnyMap>()) {
         all_species.emplace_back(newSpecies(node));
     }