diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0a71a31011..8fc0fd3f92 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -195,14 +195,13 @@ jobs:
 
     - name: Run Clang Format
       if: matrix.clang_format == 'ON'
-      run: find source \( -name *.h -o -name *.cpp -o -name *.mm \) ! -path "*/External/*" ! -path "*/NanoGUI/*" | xargs clang-format -i --verbose
+      run: find source \( -name *.h -o -name *.cpp -o -name *.mm -o -name *.inl \) ! -path "*/External/*" ! -path "*/NanoGUI/*" | xargs clang-format -i --verbose
 
     - name: CMake Generate
       run: cmake -S . -B build -DMATERIALX_BUILD_PYTHON=ON -DMATERIALX_BUILD_VIEWER=ON -DMATERIALX_BUILD_GRAPH_EDITOR=ON -DMATERIALX_TEST_RENDER=OFF -DMATERIALX_WARNINGS_AS_ERRORS=ON ${{matrix.cmake_config}}
 
     - name: CMake Build
-      run: cmake --build . --target install --config Release --parallel 2
-      working-directory: build
+      run: cmake --build build --target install --config Release --parallel 2
 
     - name: CMake Unit Tests
       run: ctest -VV --output-on-failure --build-config Release
@@ -314,8 +313,7 @@ jobs:
 
     - name: JavaScript CMake Build
       if: matrix.build_javascript == 'ON'
-      run: cmake --build . --target install --config Release --parallel 2
-      working-directory: javascript/build
+      run: cmake --build javascript/build --target install --config Release --parallel 2
     
     - name: JavaScript Unit Tests
       if: matrix.build_javascript == 'ON'
diff --git a/source/MaterialXCore/Definition.cpp b/source/MaterialXCore/Definition.cpp
index cf9587ecda..c3150e2a87 100644
--- a/source/MaterialXCore/Definition.cpp
+++ b/source/MaterialXCore/Definition.cpp
@@ -84,7 +84,7 @@ InterfaceElementPtr NodeDef::getImplementation(const string& target) const
             }
         }
     }
-    
+
     // Then search for a generic match.
     for (InterfaceElementPtr interface : interfaces)
     {
diff --git a/source/MaterialXFormat/Util.cpp b/source/MaterialXFormat/Util.cpp
index 32feda4d0d..48ded1d6b1 100644
--- a/source/MaterialXFormat/Util.cpp
+++ b/source/MaterialXFormat/Util.cpp
@@ -234,7 +234,7 @@ FileSearchPath getDefaultDataSearchPath()
         }
         currentPath = currentPath.getParentPath();
     }
-    return FileSearchPath();    
+    return FileSearchPath();
 }
 
 MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXFormat/Util.h b/source/MaterialXFormat/Util.h
index 46f55c41ee..c7ef0c6d38 100644
--- a/source/MaterialXFormat/Util.h
+++ b/source/MaterialXFormat/Util.h
@@ -62,7 +62,7 @@ MX_FORMAT_API FileSearchPath getSourceSearchPath(ConstDocumentPtr doc);
 
 /// Return a file search path to the default data library folder.
 /// The module path and all parent paths are examined to until either there is
-/// no parent or the library folder is found. 
+/// no parent or the library folder is found.
 MX_FORMAT_API FileSearchPath getDefaultDataSearchPath();
 
 MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
index ec5e48d4ec..ea78e1bee3 100644
--- a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
+++ b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp
@@ -56,17 +56,17 @@ GlslShaderGenerator::GlslShaderGenerator() :
     //
 
     StringVec elementNames;
-    
+
     // <!-- <switch> -->
     elementNames = {
         // <!-- 'which' type : float -->
-        "IM_switch_float_"   + GlslShaderGenerator::TARGET,
-        "IM_switch_color3_"  + GlslShaderGenerator::TARGET,
-        "IM_switch_color4_"  + GlslShaderGenerator::TARGET,
+        "IM_switch_float_" + GlslShaderGenerator::TARGET,
+        "IM_switch_color3_" + GlslShaderGenerator::TARGET,
+        "IM_switch_color4_" + GlslShaderGenerator::TARGET,
         "IM_switch_vector2_" + GlslShaderGenerator::TARGET,
         "IM_switch_vector3_" + GlslShaderGenerator::TARGET,
         "IM_switch_vector4_" + GlslShaderGenerator::TARGET,
-        
+
         // <!-- 'which' type : integer -->
         "IM_switch_floatI_" + GlslShaderGenerator::TARGET,
         "IM_switch_color3I_" + GlslShaderGenerator::TARGET,
@@ -85,7 +85,7 @@ GlslShaderGenerator::GlslShaderGenerator() :
         "IM_swizzle_float_vector2_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_float_vector3_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_float_vector4_" + GlslShaderGenerator::TARGET,
-        
+
         // <!-- from type : color3 -->
         "IM_swizzle_color3_float_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_color3_color3_" + GlslShaderGenerator::TARGET,
@@ -93,7 +93,7 @@ GlslShaderGenerator::GlslShaderGenerator() :
         "IM_swizzle_color3_vector2_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_color3_vector3_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_color3_vector4_" + GlslShaderGenerator::TARGET,
-        
+
         // <!-- from type : color4 -->
         "IM_swizzle_color4_float_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_color4_color3_" + GlslShaderGenerator::TARGET,
@@ -101,7 +101,7 @@ GlslShaderGenerator::GlslShaderGenerator() :
         "IM_swizzle_color4_vector2_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_color4_vector3_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_color4_vector4_" + GlslShaderGenerator::TARGET,
-        
+
         // <!-- from type : vector2 -->
         "IM_swizzle_vector2_float_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector2_color3_" + GlslShaderGenerator::TARGET,
@@ -109,7 +109,7 @@ GlslShaderGenerator::GlslShaderGenerator() :
         "IM_swizzle_vector2_vector2_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector2_vector3_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector2_vector4_" + GlslShaderGenerator::TARGET,
-        
+
         // <!-- from type : vector3 -->
         "IM_swizzle_vector3_float_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector3_color3_" + GlslShaderGenerator::TARGET,
@@ -117,7 +117,7 @@ GlslShaderGenerator::GlslShaderGenerator() :
         "IM_swizzle_vector3_vector2_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector3_vector3_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector3_vector4_" + GlslShaderGenerator::TARGET,
-        
+
         // <!-- from type : vector4 -->
         "IM_swizzle_vector4_float_" + GlslShaderGenerator::TARGET,
         "IM_swizzle_vector4_color3_" + GlslShaderGenerator::TARGET,
diff --git a/source/MaterialXGenMdl/MdlShaderGenerator.cpp b/source/MaterialXGenMdl/MdlShaderGenerator.cpp
index e10d586d69..af75a2cef4 100644
--- a/source/MaterialXGenMdl/MdlShaderGenerator.cpp
+++ b/source/MaterialXGenMdl/MdlShaderGenerator.cpp
@@ -291,9 +291,9 @@ ShaderPtr MdlShaderGenerator::generate(const string& name, ElementPtr element, G
         {
             emitLine("float3 displacement__ = " + result + ".geometry.displacement", stage);
             emitLine("color finalOutput__ = mk_color3("
-                "r: math::dot(displacement__, state::texture_tangent_u(0)),"
-                "g: math::dot(displacement__, state::texture_tangent_v(0)),"
-                "b: math::dot(displacement__, state::normal()))", stage);
+                     "r: math::dot(displacement__, state::texture_tangent_u(0)),"
+                     "g: math::dot(displacement__, state::texture_tangent_v(0)),"
+                     "b: math::dot(displacement__, state::normal()))", stage);
         }
         else
         {
diff --git a/source/MaterialXGenMdl/MdlSyntax.cpp b/source/MaterialXGenMdl/MdlSyntax.cpp
index 9d5483bcca..7560297ce4 100644
--- a/source/MaterialXGenMdl/MdlSyntax.cpp
+++ b/source/MaterialXGenMdl/MdlSyntax.cpp
@@ -48,7 +48,7 @@ class MdlFilenameTypeSyntax : public ScalarTypeSyntax
         // assuming it ends with a slash ...
         if (outputValue.back() == '/')
         {
-             return getDefaultValue(true);
+            return getDefaultValue(true);
         }
         // ... or the last segment does not have an extension suffix
         size_t idx_s = outputValue.find_last_of('/');
diff --git a/source/MaterialXGenMdl/Nodes/ClosureCompoundNodeMdl.cpp b/source/MaterialXGenMdl/Nodes/ClosureCompoundNodeMdl.cpp
index e175696d55..0a2004cd71 100644
--- a/source/MaterialXGenMdl/Nodes/ClosureCompoundNodeMdl.cpp
+++ b/source/MaterialXGenMdl/Nodes/ClosureCompoundNodeMdl.cpp
@@ -41,7 +41,7 @@ void ClosureCompoundNodeMdl::emitFunctionDefinition(const ShaderNode& node, GenC
             {
                 if (!outputSocket->getConnection())
                     continue;
-        
+
                 const ShaderNode* upstream = outputSocket->getConnection()->getNode();
                 const bool isMaterialExpr = (upstream->hasClassification(ShaderNode::Classification::CLOSURE) ||
                                              upstream->hasClassification(ShaderNode::Classification::SHADER));
diff --git a/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.cpp b/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.cpp
index fd27d5e547..bff1351142 100644
--- a/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.cpp
+++ b/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.cpp
@@ -368,12 +368,12 @@ const string& MixBsdfNodeMdl::getOperatorName(size_t index) const
 {
     switch (index)
     {
-    case 0:
-        return StringConstantsMdl::FG;
-    case 1:
-        return StringConstantsMdl::BG;
-    default:
-        return StringConstantsMdl::EMPTY;
+        case 0:
+            return StringConstantsMdl::FG;
+        case 1:
+            return StringConstantsMdl::BG;
+        default:
+            return StringConstantsMdl::EMPTY;
     }
 }
 
@@ -386,12 +386,12 @@ const string& AddOrMultiplyBsdfNodeMdl::getOperatorName(size_t index) const
 {
     switch (index)
     {
-    case 0:
-        return StringConstantsMdl::IN1;
-    case 1:
-        return StringConstantsMdl::IN2;
-    default:
-        return StringConstantsMdl::EMPTY;
+        case 0:
+            return StringConstantsMdl::IN1;
+        case 1:
+            return StringConstantsMdl::IN2;
+        default:
+            return StringConstantsMdl::EMPTY;
     }
 }
 
diff --git a/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.h b/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.h
index 75ea46046c..95c51198f8 100644
--- a/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.h
+++ b/source/MaterialXGenMdl/Nodes/ClosureLayerNodeMdl.h
@@ -21,18 +21,18 @@ class MX_GENMDL_API StringConstantsMdl
 
   public:
     /// String constants
-    static const string TOP; ///< layer parameter name of the top component
+    static const string TOP;  ///< layer parameter name of the top component
     static const string BASE; ///< layer parameter name of the base component
-    static const string FG; ///< parameter of the mix node
-    static const string BG; ///< parameter of the mix node
-    static const string IN1; ///< parameter of the add and multiply nodes
-    static const string IN2; ///< parameter of the add and multiply nodes
+    static const string FG;   ///< parameter of the mix node
+    static const string BG;   ///< parameter of the mix node
+    static const string IN1;  ///< parameter of the add and multiply nodes
+    static const string IN2;  ///< parameter of the add and multiply nodes
 
     static const string THICKNESS; ///< thickness parameter name of the thin_film_bsdf
-    static const string IOR; ///< ior parameter name of the thin_film_bsdf
+    static const string IOR;       ///< ior parameter name of the thin_film_bsdf
 
     static const string THIN_FILM_THICKNESS; ///< helper parameter name for transporting thickness
-    static const string THIN_FILM_IOR; ///< helper parameter name for transporting ior
+    static const string THIN_FILM_IOR;       ///< helper parameter name for transporting ior
 
     static const string EMPTY; ///< the empty string ""
 };
@@ -41,7 +41,7 @@ class MX_GENMDL_API StringConstantsMdl
 /// thin_film_bsdf through layers and mixers, etc., to the elemental bsdfs that support thin film.
 /// Because thin-film can not be layered on any BSDF in MDL, we try to push down the parameters to
 /// the nodes that support thin-film.
-template<typename TBase> class CarryThinFilmParameters : public TBase
+template <typename TBase> class CarryThinFilmParameters : public TBase
 {
   public:
     /// Add the thin film inputs for transporting the parameter.
diff --git a/source/MaterialXGenMsl/MslShaderGenerator.cpp b/source/MaterialXGenMsl/MslShaderGenerator.cpp
index ea3fb7112d..7fe50fef4a 100644
--- a/source/MaterialXGenMsl/MslShaderGenerator.cpp
+++ b/source/MaterialXGenMsl/MslShaderGenerator.cpp
@@ -1018,7 +1018,7 @@ void MslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& co
             emitLightData(context, stage);
         }
     }
-    
+
     bool needsLightBuffer = lighting && context.getOptions().hwMaxActiveLightSources > 0;
 
     emitMathMatrixScalarMathOperators(context, stage);
diff --git a/source/MaterialXGenOsl/OslShaderGenerator.cpp b/source/MaterialXGenOsl/OslShaderGenerator.cpp
index fbb2bb29be..f16770174b 100644
--- a/source/MaterialXGenOsl/OslShaderGenerator.cpp
+++ b/source/MaterialXGenOsl/OslShaderGenerator.cpp
@@ -536,7 +536,7 @@ void OslShaderGenerator::emitShaderInputs(const VariableBlock& inputs, ShaderSta
             // which is a struct containing a file string and a colorspace string.
             // For the published shader interface we here split this into two separate inputs,
             // which gives a nicer shader interface with widget metadata on each input.
-            
+
             ValuePtr value = input->getValue();
             const string valueStr = value ? value->getValueString() : EMPTY_STRING;
 
diff --git a/source/MaterialXGenShader/HwShaderGenerator.cpp b/source/MaterialXGenShader/HwShaderGenerator.cpp
index 568c666478..0db78eda27 100644
--- a/source/MaterialXGenShader/HwShaderGenerator.cpp
+++ b/source/MaterialXGenShader/HwShaderGenerator.cpp
@@ -260,9 +260,9 @@ ShaderPtr HwShaderGenerator::createShader(const string& name, ElementPtr element
             if (geomprop)
             {
                 // A default geomprop was assigned to this graph input.
-                // For all internal connections to this input, break the connection 
+                // For all internal connections to this input, break the connection
                 // and assign a geomprop node that generates this data.
-                // Note: If a geomprop node exists already it is reused, 
+                // Note: If a geomprop node exists already it is reused,
                 // so only a single node per geometry type is created.
                 ShaderInputVec connections = socket->getConnections();
                 for (auto connection : connections)
diff --git a/source/MaterialXGenShader/Nodes/HwTransformNode.cpp b/source/MaterialXGenShader/Nodes/HwTransformNode.cpp
index 018924855d..76394309af 100644
--- a/source/MaterialXGenShader/Nodes/HwTransformNode.cpp
+++ b/source/MaterialXGenShader/Nodes/HwTransformNode.cpp
@@ -17,7 +17,7 @@ const string HwTransformNode::WORLD = "world";
 
 void HwTransformNode::createVariables(const ShaderNode& node, GenContext&, Shader& shader) const
 {
-    const string toSpace   = getToSpace(node);
+    const string toSpace = getToSpace(node);
     const string fromSpace = getFromSpace(node);
     const string& matrix = getMatrix(fromSpace, toSpace);
     if (!matrix.empty())
diff --git a/source/MaterialXGenShader/ShaderGenerator.cpp b/source/MaterialXGenShader/ShaderGenerator.cpp
index 177201a9e3..d5f51aed1c 100644
--- a/source/MaterialXGenShader/ShaderGenerator.cpp
+++ b/source/MaterialXGenShader/ShaderGenerator.cpp
@@ -270,7 +270,7 @@ void ShaderGenerator::registerImplementation(const string& name, CreatorFunction
 
 void ShaderGenerator::registerImplementation(const StringVec& nameVec, CreatorFunction<ShaderNodeImpl> creator)
 {
-    for(const string& name : nameVec)
+    for (const string& name : nameVec)
     {
         _implFactory.registerClass(name, creator);
     }
diff --git a/source/MaterialXGenShader/ShaderGenerator.h b/source/MaterialXGenShader/ShaderGenerator.h
index 8e7f9855de..fa60a4d63e 100644
--- a/source/MaterialXGenShader/ShaderGenerator.h
+++ b/source/MaterialXGenShader/ShaderGenerator.h
@@ -151,7 +151,7 @@ class MX_GENSHADER_API ShaderGenerator
 
     /// Register a shader node implementation for a given implementation element name
     void registerImplementation(const string& name, CreatorFunction<ShaderNodeImpl> creator);
-    
+
     /// Register a shader node implementation for a given set of implementation element names
     void registerImplementation(const StringVec& nameVec, CreatorFunction<ShaderNodeImpl> creator);
 
diff --git a/source/MaterialXGenShader/ShaderNode.cpp b/source/MaterialXGenShader/ShaderNode.cpp
index 3e393178f1..9ef5b0789a 100644
--- a/source/MaterialXGenShader/ShaderNode.cpp
+++ b/source/MaterialXGenShader/ShaderNode.cpp
@@ -290,7 +290,7 @@ ShaderNodePtr ShaderNode::create(const ShaderGraph* parent, const string& name,
     else if (nodeDef.getNodeString() == CONSTANT)
     {
         newNode->_classification = Classification::TEXTURE | Classification::CONSTANT;
-    }    
+    }
     else if (nodeDef.getNodeString() == DOT)
     {
         newNode->_classification = Classification::TEXTURE | Classification::DOT;
diff --git a/source/MaterialXGenShader/ShaderStage.cpp b/source/MaterialXGenShader/ShaderStage.cpp
index b5387bcb94..d304c22dd2 100644
--- a/source/MaterialXGenShader/ShaderStage.cpp
+++ b/source/MaterialXGenShader/ShaderStage.cpp
@@ -82,8 +82,8 @@ ShaderPort* VariableBlock::add(const TypeDesc* type, const string& name, ValuePt
         else if (type != it->second->getType())
         {
             throw ExceptionShaderGenError("Trying to add shader port '" + name + "' with type '" +
-                type->getName() + "', but existing shader port with type '" +
-                it->second->getType()->getName() + "' was found");
+                                          type->getName() + "', but existing shader port with type '" +
+                                          it->second->getType()->getName() + "' was found");
         }
         return it->second.get();
     }
diff --git a/source/MaterialXRender/Camera.cpp b/source/MaterialXRender/Camera.cpp
index 6464246e3a..7b9579376c 100644
--- a/source/MaterialXRender/Camera.cpp
+++ b/source/MaterialXRender/Camera.cpp
@@ -23,8 +23,8 @@ Matrix44 Camera::createViewMatrix(const Vector3& eye,
 }
 
 Matrix44 Camera::createPerspectiveMatrixZP(float left, float right,
-                                         float bottom, float top,
-                                         float nearP, float farP)
+                                           float bottom, float top,
+                                           float nearP, float farP)
 {
     return Matrix44(
         (2.0f * nearP) / (right - left), 0.0f, (right + left) / (right - left), 0.0f,
@@ -34,8 +34,8 @@ Matrix44 Camera::createPerspectiveMatrixZP(float left, float right,
 }
 
 Matrix44 Camera::createOrthographicMatrixZP(float left, float right,
-                                          float bottom, float top,
-                                          float nearP, float farP)
+                                            float bottom, float top,
+                                            float nearP, float farP)
 {
     return Matrix44(
         2.0f / (right - left), 0.0f, 0.0f, 0.0f,
diff --git a/source/MaterialXRender/Camera.h b/source/MaterialXRender/Camera.h
index a20c0f0e70..3135904b5a 100644
--- a/source/MaterialXRender/Camera.h
+++ b/source/MaterialXRender/Camera.h
@@ -163,17 +163,17 @@ class MX_RENDER_API Camera
     static Matrix44 createOrthographicMatrix(float left, float right,
                                              float bottom, float top,
                                              float nearP, float farP);
-    
+
     /// Create a perpective projection matrix given a set of clip planes with [0,1] projected Z.
     static Matrix44 createPerspectiveMatrixZP(float left, float right,
-                                            float bottom, float top,
-                                            float nearP, float farP);
+                                              float bottom, float top,
+                                              float nearP, float farP);
 
     /// Create an orthographic projection matrix given a set of clip planes with [0,1] projected Z.
     static Matrix44 createOrthographicMatrixZP(float left, float right,
-                                             float bottom, float top,
-                                             float nearP, float farP);
- 
+                                               float bottom, float top,
+                                               float nearP, float farP);
+
     /// Apply a perspective transform to the given 3D point, performing a
     /// homogeneous divide on the transformed result.
     static Vector3 transformPointPerspective(const Matrix44& m, const Vector3& v)
@@ -185,7 +185,7 @@ class MX_RENDER_API Camera
     /// @}
 
   protected:
-    // Transform matrices 
+    // Transform matrices
     Matrix44 _worldMatrix;
     Matrix44 _viewMatrix;
     Matrix44 _projectionMatrix;
diff --git a/source/MaterialXRender/CgltfLoader.cpp b/source/MaterialXRender/CgltfLoader.cpp
index 1c8ec598a6..a9f5208ec4 100644
--- a/source/MaterialXRender/CgltfLoader.cpp
+++ b/source/MaterialXRender/CgltfLoader.cpp
@@ -59,7 +59,7 @@ void computeMeshMatrices(GLTFMeshMatrixList& meshMatrices, cgltf_node* cnode)
     }
 
     // Iterate over all children. Note that the existence of a mesh
-    // does not imply that this is a leaf node so traversal should 
+    // does not imply that this is a leaf node so traversal should
     // continue even when a mesh is encountered.
     for (cgltf_size i = 0; i < cnode->children_count; i++)
     {
@@ -76,7 +76,7 @@ using GLTFMeshPathList = std::unordered_map<cgltf_mesh*, StringVec>;
 void computeMeshPaths(GLTFMeshPathList& meshPaths, cgltf_node* cnode, FilePath path, size_t nodeCount, size_t meshCount)
 {
     string cnodeName = cnode->name ? string(cnode->name) : DEFAULT_NODE_PREFIX + std::to_string(nodeCount++);
-    path = path / ( createValidName(cnodeName) + "/" );
+    path = path / (createValidName(cnodeName) + "/");
 
     cgltf_mesh* cmesh = cnode->mesh;
     if (cmesh)
@@ -92,7 +92,7 @@ void computeMeshPaths(GLTFMeshPathList& meshPaths, cgltf_node* cnode, FilePath p
     }
 
     // Iterate over all children. Note that the existence of a mesh
-    // does not imply that this is a leaf node so traversal should 
+    // does not imply that this is a leaf node so traversal should
     // continue even when a mesh is encountered.
     for (cgltf_size i = 0; i < cnode->children_count; i++)
     {
@@ -220,11 +220,11 @@ bool CgltfLoader::load(const FilePath& filePath, MeshList& meshList, bool texcoo
         }
 
         // Iterate through all parent transform
-        for (size_t mtx=0; mtx < positionMatrices.size(); mtx++)
+        for (size_t mtx = 0; mtx < positionMatrices.size(); mtx++)
         {
             const Matrix44& positionMatrix = positionMatrices[mtx];
             const Matrix44 normalMatrix = positionMatrix.getInverse().getTranspose();
-            
+
             for (cgltf_size primitiveIndex = 0; primitiveIndex < cmesh->primitives_count; ++primitiveIndex)
             {
                 cgltf_primitive* primitive = &cmesh->primitives[primitiveIndex];
@@ -348,7 +348,7 @@ bool CgltfLoader::load(const FilePath& filePath, MeshList& meshList, bool texcoo
                     {
                         if (_debugLevel > 0)
                             std::cout << "Unknown stream type: " << std::to_string(attribute->type)
-                            << std::endl;
+                                      << std::endl;
                     }
 
                     // Fill in stream
diff --git a/source/MaterialXRender/CgltfLoader.h b/source/MaterialXRender/CgltfLoader.h
index 4f4a7145ba..fb63cb6102 100644
--- a/source/MaterialXRender/CgltfLoader.h
+++ b/source/MaterialXRender/CgltfLoader.h
@@ -6,7 +6,7 @@
 #ifndef MATERIALX_CGLTFLOADER_H
 #define MATERIALX_CGLTFLOADER_H
 
-/// @file 
+/// @file
 /// GLTF format loader using the Cgltf library
 
 #include <MaterialXRender/GeometryHandler.h>
@@ -32,7 +32,7 @@ class MX_RENDER_API CgltfLoader : public GeometryLoader
     static CgltfLoaderPtr create() { return std::make_shared<CgltfLoader>(); }
 
     /// Load geometry from file path
-    bool load(const FilePath& filePath, MeshList& meshList, bool texcoordVerticalFlip=false) override;
+    bool load(const FilePath& filePath, MeshList& meshList, bool texcoordVerticalFlip = false) override;
 
   private:
     unsigned int _debugLevel;
diff --git a/source/MaterialXRender/GeometryHandler.cpp b/source/MaterialXRender/GeometryHandler.cpp
index e2c974a767..dfea0b2ceb 100644
--- a/source/MaterialXRender/GeometryHandler.cpp
+++ b/source/MaterialXRender/GeometryHandler.cpp
@@ -89,7 +89,7 @@ bool GeometryHandler::loadGeometry(const FilePath& filePath, bool texcoordVertic
 
     bool loaded = false;
 
-    std::pair <GeometryLoaderMap::iterator, GeometryLoaderMap::iterator> range;
+    std::pair<GeometryLoaderMap::iterator, GeometryLoaderMap::iterator> range;
     string extension = filePath.getExtension();
     range = _geometryLoaders.equal_range(extension);
     GeometryLoaderMap::iterator first = --range.second;
@@ -140,19 +140,17 @@ MeshPtr GeometryHandler::createQuadMesh(const Vector2& uvMin, const Vector2& uvM
     quadTexCoords->setStride(MeshStream::STRIDE_2D);
     if (!flipTexCoordsHorizontally)
     {
-        quadTexCoords->getData().assign({
-            uvMax[0], uvMax[1],
-            uvMax[0], uvMin[1],
-            uvMin[0], uvMin[1],
-            uvMin[0], uvMax[1] });
+        quadTexCoords->getData().assign({ uvMax[0], uvMax[1],
+                                          uvMax[0], uvMin[1],
+                                          uvMin[0], uvMin[1],
+                                          uvMin[0], uvMax[1] });
     }
     else
     {
-        quadTexCoords->getData().assign({
-            uvMax[0], uvMin[1],
-            uvMax[0], uvMax[1],
-            uvMin[0], uvMax[1],
-            uvMin[0], uvMin[1] });
+        quadTexCoords->getData().assign({ uvMax[0], uvMin[1],
+                                          uvMax[0], uvMax[1],
+                                          uvMin[0], uvMax[1],
+                                          uvMin[0], uvMin[1] });
     }
     MeshPartitionPtr quadIndices = MeshPartition::create();
     quadIndices->getIndices().assign({ 0, 1, 3, 1, 2, 3 });
@@ -161,7 +159,7 @@ MeshPtr GeometryHandler::createQuadMesh(const Vector2& uvMin, const Vector2& uvM
     quadMesh->addStream(quadPositions);
     quadMesh->addStream(quadTexCoords);
     quadMesh->addPartition(quadIndices);
-    
+
     return quadMesh;
 }
 
diff --git a/source/MaterialXRender/GeometryHandler.h b/source/MaterialXRender/GeometryHandler.h
index 0022487602..5dfc561e0e 100644
--- a/source/MaterialXRender/GeometryHandler.h
+++ b/source/MaterialXRender/GeometryHandler.h
@@ -121,7 +121,7 @@ class MX_RENDER_API GeometryHandler
     static MeshPtr createQuadMesh(const Vector2& uvMin = Vector2(0.0f, 0.0f),
                                   const Vector2& uvMax = Vector2(1.0f, 1.0f),
                                   bool flipTexCoordsHorizontally = false);
-    
+
   protected:
     // Recompute bounds for all stored geometry
     void computeBounds();
diff --git a/source/MaterialXRender/Harmonics.cpp b/source/MaterialXRender/Harmonics.cpp
index daf6a59d10..3d5c9d0a1d 100644
--- a/source/MaterialXRender/Harmonics.cpp
+++ b/source/MaterialXRender/Harmonics.cpp
@@ -9,7 +9,8 @@
 
 MATERIALX_NAMESPACE_BEGIN
 
-namespace {
+namespace
+{
 
 const double PI = std::acos(-1.0);
 
diff --git a/source/MaterialXRender/Harmonics.h b/source/MaterialXRender/Harmonics.h
index 10d5f81e49..f51991361a 100644
--- a/source/MaterialXRender/Harmonics.h
+++ b/source/MaterialXRender/Harmonics.h
@@ -27,7 +27,8 @@ template <class C, size_t B> class ShCoeffs
 
   public:
     ShCoeffs() = default;
-    explicit ShCoeffs(const std::array<C, NUM_COEFFS>& arr) : _arr(arr) { }
+    explicit ShCoeffs(const std::array<C, NUM_COEFFS>& arr) :
+        _arr(arr) { }
 
     /// @name Comparison Operators
     /// @{
diff --git a/source/MaterialXRender/ImageHandler.cpp b/source/MaterialXRender/ImageHandler.cpp
index d54a18fedd..2d56207f32 100644
--- a/source/MaterialXRender/ImageHandler.cpp
+++ b/source/MaterialXRender/ImageHandler.cpp
@@ -306,12 +306,11 @@ void ImageSamplingProperties::setProperties(const string& fileNameUniform,
 
 bool ImageSamplingProperties::operator==(const ImageSamplingProperties& r) const
 {
-    return
-      (enableMipmaps == r.enableMipmaps &&
-       uaddressMode  == r.uaddressMode  &&
-       vaddressMode  == r.vaddressMode  &&
-       filterType    == r.filterType    &&
-       defaultColor  == r.defaultColor)  ;
+    return (enableMipmaps == r.enableMipmaps &&
+            uaddressMode == r.uaddressMode &&
+            vaddressMode == r.vaddressMode &&
+            filterType == r.filterType &&
+            defaultColor == r.defaultColor);
 }
 
 MATERIALX_NAMESPACE_END
diff --git a/source/MaterialXRender/ImageHandler.h b/source/MaterialXRender/ImageHandler.h
index fafc021857..e8eaf99b2f 100644
--- a/source/MaterialXRender/ImageHandler.h
+++ b/source/MaterialXRender/ImageHandler.h
@@ -35,7 +35,7 @@ using ImageHandlerPtr = std::shared_ptr<ImageHandler>;
 using ImageLoaderPtr = std::shared_ptr<ImageLoader>;
 
 /// Map from strings to vectors of image loaders
-using ImageLoaderMap = std::unordered_map< string, std::vector<ImageLoaderPtr> >;
+using ImageLoaderMap = std::unordered_map<string, std::vector<ImageLoaderPtr>>;
 
 /// @class ImageSamplingProperties
 /// Interface to describe sampling properties for images.
@@ -48,16 +48,16 @@ class MX_RENDER_API ImageSamplingProperties
     /// @param uniformBlock Block containing sampler uniforms
     void setProperties(const string& fileNameUniform,
                        const VariableBlock& uniformBlock);
-    
+
     bool operator==(const ImageSamplingProperties& r) const;
 
     /// Address mode options. Matches enumerations allowed for image address
     /// modes, except UNSPECIFIED which indicates no explicit mode was defined.
     enum class AddressMode : int
-    { 
+    {
         UNSPECIFIED = -1,
         CONSTANT = 0,
-        CLAMP = 1, 
+        CLAMP = 1,
         PERIODIC = 2,
         MIRROR = 3
     };
diff --git a/source/MaterialXRender/LightHandler.cpp b/source/MaterialXRender/LightHandler.cpp
index cc96d979c7..c7d9311005 100644
--- a/source/MaterialXRender/LightHandler.cpp
+++ b/source/MaterialXRender/LightHandler.cpp
@@ -51,7 +51,7 @@ void LightHandler::findLights(DocumentPtr doc, vector<NodePtr>& lights)
 
 void LightHandler::registerLights(DocumentPtr doc, const vector<NodePtr>& lights, GenContext& context)
 {
-    // Clear context light user data which is set when bindLightShader() 
+    // Clear context light user data which is set when bindLightShader()
     // is called. This is necessary in case the light types have already been
     // registered.
     HwShaderGenerator::unbindLightShaders(context);
@@ -71,7 +71,7 @@ void LightHandler::registerLights(DocumentPtr doc, const vector<NodePtr>& lights
     }
 
     // Make sure max light count is large enough
-    const unsigned int lightCount = (unsigned int)lights.size();
+    const unsigned int lightCount = (unsigned int) lights.size();
     if (lightCount > context.getOptions().hwMaxActiveLightSources)
     {
         context.getOptions().hwMaxActiveLightSources = lightCount;
diff --git a/source/MaterialXRender/LightHandler.h b/source/MaterialXRender/LightHandler.h
index 666edd34a1..852ccfa41d 100644
--- a/source/MaterialXRender/LightHandler.h
+++ b/source/MaterialXRender/LightHandler.h
@@ -48,7 +48,7 @@ class MX_RENDER_API LightHandler
 
     /// @name Global State
     /// @{
-    
+
     /// Set the light transform.
     void setLightTransform(const Matrix44& mat)
     {
diff --git a/source/MaterialXRender/Mesh.cpp b/source/MaterialXRender/Mesh.cpp
index 110829cd21..bfa7dedd13 100644
--- a/source/MaterialXRender/Mesh.cpp
+++ b/source/MaterialXRender/Mesh.cpp
@@ -18,7 +18,8 @@ const string MeshStream::BITANGENT_ATTRIBUTE("bitangent");
 const string MeshStream::COLOR_ATTRIBUTE("color");
 const string MeshStream::GEOMETRY_PROPERTY_ATTRIBUTE("geomprop");
 
-namespace {
+namespace
+{
 
 const float MAX_FLOAT = std::numeric_limits<float>::max();
 const size_t FACE_VERTEX_COUNT = 3;
@@ -266,7 +267,7 @@ void Mesh::splitByUdims()
 // MeshStream methods
 //
 
-void MeshStream::transform(const Matrix44 &matrix)
+void MeshStream::transform(const Matrix44& matrix)
 {
     unsigned int stride = getStride();
     size_t numElements = _data.size() / getStride();
@@ -274,17 +275,17 @@ void MeshStream::transform(const Matrix44 &matrix)
         getType() == MeshStream::TEXCOORD_ATTRIBUTE ||
         getType() == MeshStream::GEOMETRY_PROPERTY_ATTRIBUTE)
     {
-        for (size_t i=0; i<numElements; i++)
+        for (size_t i = 0; i < numElements; i++)
         {
             Vector4 vec(0.0, 0.0, 0.0, 1.0);
-            for (size_t j=0; j<stride; j++)
+            for (size_t j = 0; j < stride; j++)
             {
-                vec[j] = _data[i*stride + j];
+                vec[j] = _data[i * stride + j];
             }
             vec = matrix.multiply(vec);
-            for (size_t k=0; k<stride; k++)
+            for (size_t k = 0; k < stride; k++)
             {
-                _data[i*stride + k] = vec[k];
+                _data[i * stride + k] = vec[k];
             }
         }
     }
@@ -295,17 +296,17 @@ void MeshStream::transform(const Matrix44 &matrix)
         bool isNormalStream = (getType() == MeshStream::NORMAL_ATTRIBUTE);
         Matrix44 transformMatrix = isNormalStream ? matrix.getInverse().getTranspose() : matrix;
 
-        for (size_t i=0; i<numElements; i++)
+        for (size_t i = 0; i < numElements; i++)
         {
             Vector3 vec(0.0, 0.0, 0.0);
-            for (size_t j=0; j<stride; j++)
+            for (size_t j = 0; j < stride; j++)
             {
-                vec[j] = _data[i*stride + j];
+                vec[j] = _data[i * stride + j];
             }
             vec = transformMatrix.transformVector(vec).getNormalized();
-            for (size_t k=0; k<stride; k++)
+            for (size_t k = 0; k < stride; k++)
             {
-                _data[i*stride + k] = vec[k];
+                _data[i * stride + k] = vec[k];
             }
         }
     }
diff --git a/source/MaterialXRender/Mesh.h b/source/MaterialXRender/Mesh.h
index 7166ff73d3..987b9cd69f 100644
--- a/source/MaterialXRender/Mesh.h
+++ b/source/MaterialXRender/Mesh.h
@@ -132,7 +132,7 @@ class MX_RENDER_API MeshStream
     }
 
     /// Transform elements by a matrix
-    void transform(const Matrix44 &matrix);
+    void transform(const Matrix44& matrix);
 
   protected:
     string _name;
diff --git a/source/MaterialXRender/OiioImageLoader.cpp b/source/MaterialXRender/OiioImageLoader.cpp
index c3553ed162..6195a935a0 100644
--- a/source/MaterialXRender/OiioImageLoader.cpp
+++ b/source/MaterialXRender/OiioImageLoader.cpp
@@ -7,9 +7,9 @@
 
 #if defined(_MSC_VER)
     #pragma warning(push)
-    #pragma warning(disable: 4100)
-    #pragma warning(disable: 4244)
-    #pragma warning(disable: 4800)
+    #pragma warning(disable : 4100)
+    #pragma warning(disable : 4244)
+    #pragma warning(disable : 4800)
 #endif
 
 #include <OpenImageIO/imageio.h>
@@ -56,7 +56,7 @@ bool OiioImageLoader::saveImage(const FilePath& filePath,
                 written = imageOutput->write_image(
                     format,
                     static_cast<char*>(image->getResourceBuffer()) + (image->getHeight() - 1) * scanlinesize,
-                    OIIO::AutoStride, // default x stride
+                    OIIO::AutoStride,                           // default x stride
                     static_cast<OIIO::stride_t>(-scanlinesize), // special y stride
                     OIIO::AutoStride);
             }
@@ -66,10 +66,10 @@ bool OiioImageLoader::saveImage(const FilePath& filePath,
             }
             imageOutput->close();
 
-            // Handle deallocation in OpenImageIO 1.x
-            #if OIIO_VERSION < 10903
+// Handle deallocation in OpenImageIO 1.x
+#if OIIO_VERSION < 10903
             OIIO::ImageOutput::destroy(imageOutput);
-            #endif
+#endif
         }
     }
     return written;
@@ -112,10 +112,10 @@ ImagePtr OiioImageLoader::loadImage(const FilePath& filePath)
     }
     imageInput->close();
 
-    // Handle deallocation in OpenImageIO 1.x
-    #if OIIO_VERSION < 10903
+// Handle deallocation in OpenImageIO 1.x
+#if OIIO_VERSION < 10903
     OIIO::ImageInput::destroy(imageInput);
-    #endif
+#endif
 
     return image;
 }
diff --git a/source/MaterialXRender/OiioImageLoader.h b/source/MaterialXRender/OiioImageLoader.h
index 6619c85bb2..38781dad9e 100644
--- a/source/MaterialXRender/OiioImageLoader.h
+++ b/source/MaterialXRender/OiioImageLoader.h
@@ -7,7 +7,7 @@
 #define MATERIALX_OIIOIMAGELOADER_H
 
 /// @file
-/// Image loader wrapper using OpenImageIO 
+/// Image loader wrapper using OpenImageIO
 
 #include <MaterialXRender/ImageHandler.h>
 
@@ -21,7 +21,7 @@ using OiioImageLoaderPtr = std::shared_ptr<class OiioImageLoader>;
 class MX_RENDER_API OiioImageLoader : public ImageLoader
 {
   public:
-    OiioImageLoader() 
+    OiioImageLoader()
     {
         // Set all extensions supported by OpenImageIO
         _extensions.insert(BMP_EXTENSION);
@@ -40,7 +40,7 @@ class MX_RENDER_API OiioImageLoader : public ImageLoader
         _extensions.insert(TXT_EXTENSION);
         _extensions.insert(TXR_EXTENSION);
     }
-    virtual ~OiioImageLoader() { }    
+    virtual ~OiioImageLoader() { }
 
     /// Create a new OpenImageIO image loader
     static OiioImageLoaderPtr create() { return std::make_shared<OiioImageLoader>(); }
diff --git a/source/MaterialXRender/ShaderMaterial.cpp b/source/MaterialXRender/ShaderMaterial.cpp
index d51efa54af..7b898fbe85 100644
--- a/source/MaterialXRender/ShaderMaterial.cpp
+++ b/source/MaterialXRender/ShaderMaterial.cpp
@@ -8,8 +8,9 @@
 
 MATERIALX_NAMESPACE_BEGIN
 
-ShaderMaterial::ShaderMaterial() : _hasTransparency(false) {}
-ShaderMaterial::~ShaderMaterial() {}
+ShaderMaterial::ShaderMaterial() :
+    _hasTransparency(false) { }
+ShaderMaterial::~ShaderMaterial() { }
 
 void ShaderMaterial::setDocument(DocumentPtr doc)
 {
@@ -62,9 +63,9 @@ bool ShaderMaterial::hasTransparency() const
 }
 
 bool ShaderMaterial::generateEnvironmentShader(GenContext& context,
-                                         const FilePath& filename,
-                                         DocumentPtr stdLib,
-                                         const FilePath& imagePath)
+                                               const FilePath& filename,
+                                               DocumentPtr stdLib,
+                                               const FilePath& imagePath)
 {
     // Read in the environment nodegraph.
     DocumentPtr doc = createDocument();
diff --git a/source/MaterialXRender/ShaderMaterial.h b/source/MaterialXRender/ShaderMaterial.h
index cf500463e4..f29b6f763c 100644
--- a/source/MaterialXRender/ShaderMaterial.h
+++ b/source/MaterialXRender/ShaderMaterial.h
@@ -74,7 +74,7 @@ class MX_RENDER_API ShaderMaterial
     /// Generate a shader from our currently stored element and
     /// the given generator context.
     virtual bool generateShader(GenContext& context) = 0;
-    
+
     /// Copies shader and API specific generated program from ShaderMaterial to this one.
     virtual void copyShader(MaterialPtr ShaderMaterial) = 0;
 
@@ -86,7 +86,7 @@ class MX_RENDER_API ShaderMaterial
                                            const FilePath& filename,
                                            DocumentPtr stdLib,
                                            const FilePath& imagePath);
-    
+
     /// Return the underlying hardware shader.
     ShaderPtr getShader() const;
 
diff --git a/source/MaterialXRender/ShaderRenderer.h b/source/MaterialXRender/ShaderRenderer.h
index c1cfbecfa0..829a0252c1 100644
--- a/source/MaterialXRender/ShaderRenderer.h
+++ b/source/MaterialXRender/ShaderRenderer.h
@@ -34,7 +34,7 @@ class MX_RENDER_API ShaderRenderer
     enum class MatrixConvention
     {
         OpenGL = 0,
-        Metal  = 1
+        Metal = 1
     };
     /// A map with name and source code for each shader stage.
     using StageMap = StringMap;
@@ -133,7 +133,7 @@ class MX_RENDER_API ShaderRenderer
 
   protected:
     ShaderRenderer(unsigned int width, unsigned int height, Image::BaseType baseType,
-        MatrixConvention matrixConvention = MatrixConvention::OpenGL);
+                   MatrixConvention matrixConvention = MatrixConvention::OpenGL);
 
   protected:
     unsigned int _width;
@@ -167,7 +167,7 @@ class MX_RENDER_API ExceptionRenderError : public Exception
     {
     }
 
-    ExceptionRenderError& operator=(const ExceptionRenderError& e)         
+    ExceptionRenderError& operator=(const ExceptionRenderError& e)
     {
         Exception::operator=(e);
         _errorLog = e._errorLog;
diff --git a/source/MaterialXRender/StbImageLoader.cpp b/source/MaterialXRender/StbImageLoader.cpp
index d8747b75ad..b367bf741c 100644
--- a/source/MaterialXRender/StbImageLoader.cpp
+++ b/source/MaterialXRender/StbImageLoader.cpp
@@ -7,9 +7,9 @@
 
 #if defined(_MSC_VER)
     #pragma warning(push)
-    #pragma warning(disable: 4100)
-    #pragma warning(disable: 4505)
-    #pragma warning(disable: 4996)
+    #pragma warning(disable : 4100)
+    #pragma warning(disable : 4505)
+    #pragma warning(disable : 4996)
 #endif
 
 #define STB_IMAGE_IMPLEMENTATION
@@ -96,7 +96,7 @@ ImagePtr StbImageLoader::loadImage(const FilePath& filePath)
     int height = 0;
     int channelCount = 0;
     Image::BaseType baseType = Image::BaseType::UINT8;
-    void *buffer = nullptr;
+    void* buffer = nullptr;
 
     // Select standard or float reader based on file extension.
     string extension = filePath.getExtension();
diff --git a/source/MaterialXRender/StbImageLoader.h b/source/MaterialXRender/StbImageLoader.h
index dabbb8ca9e..f9d91fbcc7 100644
--- a/source/MaterialXRender/StbImageLoader.h
+++ b/source/MaterialXRender/StbImageLoader.h
@@ -34,7 +34,7 @@ class MX_RENDER_API StbImageLoader : public ImageLoader
         _extensions.insert(PSD_EXTENSION);
         _extensions.insert(TGA_EXTENSION);
     }
-    virtual ~StbImageLoader() { }    
+    virtual ~StbImageLoader() { }
 
     /// Create a new stb image loader
     static StbImageLoaderPtr create() { return std::make_shared<StbImageLoader>(); }
diff --git a/source/MaterialXRender/TextureBaker.h b/source/MaterialXRender/TextureBaker.h
index 54b1016451..ff6f240481 100644
--- a/source/MaterialXRender/TextureBaker.h
+++ b/source/MaterialXRender/TextureBaker.h
@@ -27,7 +27,7 @@ using BakedDocumentVec = std::vector<std::pair<std::string, DocumentPtr>>;
 /// A helper class for baking procedural material content to textures.
 /// TODO: Add support for graphs containing geometric nodes such as position
 ///       and normal.
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 class TextureBaker : public Renderer
 {
   public:
@@ -112,7 +112,7 @@ class TextureBaker : public Renderer
     /// Set the name of the baked graph element.
     void setBakedGraphName(const string& name)
     {
-        _bakedGraphName= name;
+        _bakedGraphName = name;
     }
 
     /// Return the name of the baked graph element.
@@ -142,8 +142,7 @@ class TextureBaker : public Renderer
     /// Set the texture filename template.
     void setTextureFilenameTemplate(const string& filenameTemplate)
     {
-        _textureFilenameTemplate = (filenameTemplate.find("$EXTENSION") == string::npos) ?
-            filenameTemplate + ".$EXTENSION" : filenameTemplate;
+        _textureFilenameTemplate = (filenameTemplate.find("$EXTENSION") == string::npos) ? filenameTemplate + ".$EXTENSION" : filenameTemplate;
     }
 
     /// Set texFilenameOverrides if template variable exists.
@@ -218,13 +217,13 @@ class TextureBaker : public Renderer
     void optimizeBakedTextures(NodePtr shader);
 
     /// Bake material to document in memory and write baked textures to disk.
-    DocumentPtr bakeMaterialToDoc(DocumentPtr doc, const FileSearchPath& searchPath, const string& materialPath, 
+    DocumentPtr bakeMaterialToDoc(DocumentPtr doc, const FileSearchPath& searchPath, const string& materialPath,
                                   const StringVec& udimSet, std::string& documentName);
 
     /// Bake materials in the given document and write them to disk.  If multiple documents are written,
     /// then the given output filename will be used as a template.
     void bakeAllMaterials(DocumentPtr doc, const FileSearchPath& searchPath, const FilePath& outputFileName);
-    
+
     /// Set whether to write a separate document per material when calling bakeAllMaterials.
     /// By default separate documents are written.
     void writeDocumentPerMaterial(bool value)
@@ -295,7 +294,7 @@ class TextureBaker : public Renderer
     StringMap _bakedInputMap;
 
     std::unordered_map<string, NodePtr> _worldSpaceNodes;
-    
+
     bool _flipSavedImage;
 
     bool _writeDocumentPerMaterial;
diff --git a/source/MaterialXRender/TextureBaker.inl b/source/MaterialXRender/TextureBaker.inl
index bcc9401210..65759ed998 100644
--- a/source/MaterialXRender/TextureBaker.inl
+++ b/source/MaterialXRender/TextureBaker.inl
@@ -13,7 +13,8 @@
 
 MATERIALX_NAMESPACE_BEGIN
 
-namespace {
+namespace
+{
 
 const string SRGB_TEXTURE = "srgb_texture";
 const string LIN_REC709 = "lin_rec709";
@@ -23,7 +24,7 @@ const string DEFAULT_UDIM_PREFIX = "_";
 
 } // anonymous namespace
 
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 string TextureBaker<Renderer, ShaderGen>::getValueStringFromColor(const Color4& color, const string& type)
 {
     if (type == "color4" || type == "vector4")
@@ -45,7 +46,7 @@ string TextureBaker<Renderer, ShaderGen>::getValueStringFromColor(const Color4&
     return EMPTY_STRING;
 }
 
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 TextureBaker<Renderer, ShaderGen>::TextureBaker(unsigned int width, unsigned int height, Image::BaseType baseType, bool flipSavedImage) :
     Renderer(width, height, baseType),
     _distanceUnit("meter"),
@@ -97,7 +98,7 @@ TextureBaker<Renderer, ShaderGen>::TextureBaker(unsigned int width, unsigned int
     _frameCaptureImage->createResourceBuffer();
 }
 
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 size_t TextureBaker<Renderer, ShaderGen>::findVarInTemplate(const string& filename, const string& var, size_t start)
 {
     size_t i = filename.find(var, start);
@@ -112,17 +113,15 @@ size_t TextureBaker<Renderer, ShaderGen>::findVarInTemplate(const string& filena
     return i;
 }
 
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 FilePath TextureBaker<Renderer, ShaderGen>::generateTextureFilename(const StringMap& filenameTemplateMap)
 {
     string bakedImageName = _textureFilenameTemplate;
 
     for (auto& pair : filenameTemplateMap)
     {
-        string replacement = (_texTemplateOverrides.count(pair.first)) ?
-            _texTemplateOverrides[pair.first] : pair.second;
-        replacement = (filenameTemplateMap.at("$UDIM").empty() && pair.first == "$UDIMPREFIX") ?
-            EMPTY_STRING : replacement;
+        string replacement = (_texTemplateOverrides.count(pair.first)) ? _texTemplateOverrides[pair.first] : pair.second;
+        replacement = (filenameTemplateMap.at("$UDIM").empty() && pair.first == "$UDIMPREFIX") ? EMPTY_STRING : replacement;
 
         for (size_t i = 0; (i = findVarInTemplate(bakedImageName, pair.first, i)) != string::npos; i++)
         {
@@ -140,7 +139,7 @@ FilePath TextureBaker<Renderer, ShaderGen>::generateTextureFilename(const String
     return _outputImagePath / bakedImageName;
 }
 
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 StringMap TextureBaker<Renderer, ShaderGen>::initializeFileTemplateMap(InputPtr input, NodePtr shader, const string& udim)
 {
     FilePath assetPath = FilePath(shader->getActiveSourceUri());
@@ -156,7 +155,7 @@ StringMap TextureBaker<Renderer, ShaderGen>::initializeFileTemplateMap(InputPtr
     return filenameTemplateMap;
 }
 
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 bool TextureBaker<Renderer, ShaderGen>::writeBakedImage(const BakedImage& baked, ImagePtr image)
 {
     if (!Renderer::_imageHandler->saveImage(baked.filename, image, _flipSavedImage))
@@ -176,11 +175,11 @@ bool TextureBaker<Renderer, ShaderGen>::writeBakedImage(const BakedImage& baked,
     return true;
 }
 
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 void TextureBaker<Renderer, ShaderGen>::bakeShaderInputs(NodePtr material, NodePtr shader, GenContext& context, const string& udim)
 {
     _material = material;
-    
+
     if (!shader)
     {
         return;
@@ -216,16 +215,16 @@ void TextureBaker<Renderer, ShaderGen>::bakeShaderInputs(NodePtr material, NodeP
     Renderer::_imageHandler->clearImageCache();
 }
 
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 void TextureBaker<Renderer, ShaderGen>::bakeGraphOutput(OutputPtr output, GenContext& context, const StringMap& filenameTemplateMap)
 {
     if (!output)
     {
         return;
     }
-    
+
     bool encodeSrgb = _colorSpace == SRGB_TEXTURE &&
-        (output->getType() == "color3" || output->getType() == "color4");
+                      (output->getType() == "color3" || output->getType() == "color4");
     Renderer::getFramebuffer()->setEncodeSrgb(encodeSrgb);
 
     ShaderPtr shader = _generator->generate("BakingShader", output, context);
@@ -258,7 +257,7 @@ void TextureBaker<Renderer, ShaderGen>::bakeGraphOutput(OutputPtr output, GenCon
     }
 }
 
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 void TextureBaker<Renderer, ShaderGen>::optimizeBakedTextures(NodePtr shader)
 {
     if (!shader)
@@ -320,7 +319,7 @@ void TextureBaker<Renderer, ShaderGen>::optimizeBakedTextures(NodePtr shader)
     }
 }
 
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 DocumentPtr TextureBaker<Renderer, ShaderGen>::generateNewDocumentFromShader(NodePtr shader, const StringVec& udimSet)
 {
     if (!shader)
@@ -359,7 +358,7 @@ DocumentPtr TextureBaker<Renderer, ShaderGen>::generateNewDocumentFromShader(Nod
     // Optionally create a material node, connecting it to the new shader node.
     if (_material)
     {
-        string materialName = (_texTemplateOverrides.count("$MATERIAL"))? _texTemplateOverrides["$MATERIAL"] : _material->getName();
+        string materialName = (_texTemplateOverrides.count("$MATERIAL")) ? _texTemplateOverrides["$MATERIAL"] : _material->getName();
         NodePtr bakedMaterial = _bakedTextureDoc->addNode(_material->getCategory(), materialName + BAKED_POSTFIX, _material->getType());
         for (auto sourceMaterialInput : _material->getInputs())
         {
@@ -483,9 +482,9 @@ DocumentPtr TextureBaker<Renderer, ShaderGen>::generateNewDocumentFromShader(Nod
     return _bakedTextureDoc;
 }
 
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 DocumentPtr TextureBaker<Renderer, ShaderGen>::bakeMaterialToDoc(DocumentPtr doc, const FileSearchPath& searchPath, const string& materialPath,
-                                            const StringVec& udimSet, string& documentName)
+                                                                 const StringVec& udimSet, string& documentName)
 {
     if (_outputStream)
     {
@@ -551,7 +550,7 @@ DocumentPtr TextureBaker<Renderer, ShaderGen>::bakeMaterialToDoc(DocumentPtr doc
     return generateNewDocumentFromShader(shaderNode, udimSet);
 }
 
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 void TextureBaker<Renderer, ShaderGen>::bakeAllMaterials(DocumentPtr doc, const FileSearchPath& searchPath, const FilePath& outputFilename)
 {
     if (_outputImagePath.isEmpty())
@@ -593,31 +592,31 @@ void TextureBaker<Renderer, ShaderGen>::bakeAllMaterials(DocumentPtr doc, const
 
     if (_writeDocumentPerMaterial)
     {
-    // Write documents in memory to disk.
-    size_t bakeCount = bakedDocuments.size();
-    for (size_t i = 0; i < bakeCount; i++)
-    {
-        if (bakedDocuments[i].second)
+        // Write documents in memory to disk.
+        size_t bakeCount = bakedDocuments.size();
+        for (size_t i = 0; i < bakeCount; i++)
         {
-            FilePath writeFilename = outputFilename;
-
-            // Add additional filename decorations if there are multiple documents.
-            if (bakedDocuments.size() > 1)
+            if (bakedDocuments[i].second)
             {
-                const string extension = writeFilename.getExtension();
-                writeFilename.removeExtension();
-                string filenameSeparator = writeFilename.isDirectory()? EMPTY_STRING : "_";
-                writeFilename = FilePath(writeFilename.asString() + filenameSeparator + bakedDocuments[i].first + "." + extension);
-            }
+                FilePath writeFilename = outputFilename;
 
-            writeToXmlFile(bakedDocuments[i].second, writeFilename);
-            if (_outputStream)
-            {
-                *_outputStream << "Wrote baked document: " << writeFilename.asString() << std::endl;
+                // Add additional filename decorations if there are multiple documents.
+                if (bakedDocuments.size() > 1)
+                {
+                    const string extension = writeFilename.getExtension();
+                    writeFilename.removeExtension();
+                    string filenameSeparator = writeFilename.isDirectory() ? EMPTY_STRING : "_";
+                    writeFilename = FilePath(writeFilename.asString() + filenameSeparator + bakedDocuments[i].first + "." + extension);
+                }
+
+                writeToXmlFile(bakedDocuments[i].second, writeFilename);
+                if (_outputStream)
+                {
+                    *_outputStream << "Wrote baked document: " << writeFilename.asString() << std::endl;
+                }
             }
         }
     }
-}
     else if (_bakedTextureDoc)
     {
         writeToXmlFile(_bakedTextureDoc, outputFilename);
@@ -628,7 +627,7 @@ void TextureBaker<Renderer, ShaderGen>::bakeAllMaterials(DocumentPtr doc, const
     }
 }
 
-template<typename Renderer, typename ShaderGen>
+template <typename Renderer, typename ShaderGen>
 void TextureBaker<Renderer, ShaderGen>::setupUnitSystem(DocumentPtr unitDefinitions)
 {
     UnitTypeDefPtr distanceTypeDef = unitDefinitions ? unitDefinitions->getUnitTypeDef("distance") : nullptr;
diff --git a/source/MaterialXRender/TinyObjLoader.cpp b/source/MaterialXRender/TinyObjLoader.cpp
index 324a1df3e7..b01af1ebf9 100644
--- a/source/MaterialXRender/TinyObjLoader.cpp
+++ b/source/MaterialXRender/TinyObjLoader.cpp
@@ -23,7 +23,8 @@
 
 MATERIALX_NAMESPACE_BEGIN
 
-namespace {
+namespace
+{
 
 const float MAX_FLOAT = std::numeric_limits<float>::max();
 const size_t FACE_VERTEX_COUNT = 3;
@@ -32,9 +33,10 @@ class VertexVector : public VectorN<VertexVector, float, 8>
 {
   public:
     using VectorN<VertexVector, float, 8>::VectorN;
-    VertexVector(const Vector3& p, const Vector3& n, const Vector2& t) : VectorN(Uninit{})
+    VertexVector(const Vector3& p, const Vector3& n, const Vector2& t) :
+        VectorN(Uninit{})
     {
-        _arr = {p[0], p[1], p[2], n[0], n[1], n[2], t[0], t[1]};
+        _arr = { p[0], p[1], p[2], n[0], n[1], n[2], t[0], t[1] };
     }
 };
 
diff --git a/source/MaterialXRender/TinyObjLoader.h b/source/MaterialXRender/TinyObjLoader.h
index 8cfb80762b..e3934f9e41 100644
--- a/source/MaterialXRender/TinyObjLoader.h
+++ b/source/MaterialXRender/TinyObjLoader.h
@@ -6,7 +6,7 @@
 #ifndef MATERIALX_TINYOBJLOADER_H
 #define MATERIALX_TINYOBJLOADER_H
 
-/// @file 
+/// @file
 /// OBJ geometry format loader using the TinyObj library
 
 #include <MaterialXRender/GeometryHandler.h>
diff --git a/source/MaterialXRender/Types.h b/source/MaterialXRender/Types.h
index 6af59b9122..4cf936492b 100644
--- a/source/MaterialXRender/Types.h
+++ b/source/MaterialXRender/Types.h
@@ -63,9 +63,10 @@ class MX_RENDER_API Vector3d : public VectorN<Vector3d, double, 3>
   public:
     using VectorN<Vector3d, double, 3>::VectorN;
     Vector3d() = default;
-    Vector3d(double x, double y, double z) : VectorN(Uninit{})
+    Vector3d(double x, double y, double z) :
+        VectorN(Uninit{})
     {
-        _arr = {x, y, z};
+        _arr = { x, y, z };
     }
 };
 
@@ -76,9 +77,10 @@ class MX_RENDER_API Vector4d : public VectorN<Vector4d, double, 4>
   public:
     using VectorN<Vector4d, double, 4>::VectorN;
     Vector4d() = default;
-    Vector4d(double x, double y, double z, double w) : VectorN(Uninit{})
+    Vector4d(double x, double y, double z, double w) :
+        VectorN(Uninit{})
     {
-        _arr = {x, y, z, w};
+        _arr = { x, y, z, w };
     }
 };
 
@@ -89,9 +91,10 @@ class MX_RENDER_API Color3d : public VectorN<Color3d, double, 3>
   public:
     using VectorN<Color3d, double, 3>::VectorN;
     Color3d() = default;
-    Color3d(double r, double g, double b) : VectorN(Uninit{})
+    Color3d(double r, double g, double b) :
+        VectorN(Uninit{})
     {
-        _arr = {r, g, b};
+        _arr = { r, g, b };
     }
 };
 
@@ -101,7 +104,8 @@ class MX_RENDER_API Color3d : public VectorN<Color3d, double, 3>
 class MX_RENDER_API Half
 {
   public:
-    explicit Half(float value) : _data(toFloat16(value)) { }
+    explicit Half(float value) :
+        _data(toFloat16(value)) { }
     operator float() const { return toFloat32(_data); }
 
     bool operator==(Half rhs) const { return float(*this) == float(rhs); }
@@ -134,9 +138,9 @@ class MX_RENDER_API Half
     static constexpr int const shift = 13;
     static constexpr int const shiftSign = 16;
 
-    static constexpr int32_t const infN = 0x7F800000; // flt32 infinity
-    static constexpr int32_t const maxN = 0x477FE000; // max flt16 normal as a flt32
-    static constexpr int32_t const minN = 0x38800000; // min flt16 normal as a flt32
+    static constexpr int32_t const infN = 0x7F800000;            // flt32 infinity
+    static constexpr int32_t const maxN = 0x477FE000;            // max flt16 normal as a flt32
+    static constexpr int32_t const minN = 0x38800000;            // min flt16 normal as a flt32
     static constexpr int32_t const signN = (int32_t) 0x80000000; // flt32 sign bit
 
     static constexpr int32_t const infC = infN >> shift;
diff --git a/source/MaterialXRender/Util.h b/source/MaterialXRender/Util.h
index 10799cfd33..922c06e529 100644
--- a/source/MaterialXRender/Util.h
+++ b/source/MaterialXRender/Util.h
@@ -31,28 +31,28 @@ MX_RENDER_API ShaderPtr createShader(const string& shaderName, GenContext& conte
 /// Create a shader with a constant color output, using the given standard libraries
 /// for code generation.
 MX_RENDER_API ShaderPtr createConstantShader(GenContext& context,
-                               DocumentPtr stdLib,
-                               const string& shaderName,
-                               const Color3& color);
+                                             DocumentPtr stdLib,
+                                             const string& shaderName,
+                                             const Color3& color);
 
 /// Create a shader with depth value output, using the given standard libraries
 /// for code generation.
 MX_RENDER_API ShaderPtr createDepthShader(GenContext& context,
-                            DocumentPtr stdLib,
-                            const string& shaderName);
+                                          DocumentPtr stdLib,
+                                          const string& shaderName);
 
 /// Create a shader that generates a look-up table for directional albedo, using
 /// the given standard libraries for code generation.
 MX_RENDER_API ShaderPtr createAlbedoTableShader(GenContext& context,
-                                  DocumentPtr stdLib,
-                                  const string& shaderName);
+                                                DocumentPtr stdLib,
+                                                const string& shaderName);
 
 /// Create a blur shader, using the given standard libraries for code generation.
 MX_RENDER_API ShaderPtr createBlurShader(GenContext& context,
-                           DocumentPtr stdLib,
-                           const string& shaderName,
-                           const string& filterType,
-                           float filterSize);
+                                         DocumentPtr stdLib,
+                                         const string& shaderName,
+                                         const string& filterType,
+                                         float filterSize);
 
 /// @}
 /// @name User Interface Utilities
diff --git a/source/MaterialXRenderGlsl/GLContext.cpp b/source/MaterialXRenderGlsl/GLContext.cpp
index a8fac5b338..e6ebb7674f 100644
--- a/source/MaterialXRenderGlsl/GLContext.cpp
+++ b/source/MaterialXRenderGlsl/GLContext.cpp
@@ -4,12 +4,12 @@
 //
 
 #if defined(_WIN32)
-#include <windows.h>
+    #include <windows.h>
 #elif defined(__linux__) || defined(__FreeBSD__)
-#include <X11/Intrinsic.h>
+    #include <X11/Intrinsic.h>
 #elif defined(__APPLE__)
-#include <MaterialXRenderHw/WindowCocoaWrappers.h>
-#include <MaterialXRenderGlsl/GLCocoaWrappers.h>
+    #include <MaterialXRenderHw/WindowCocoaWrappers.h>
+    #include <MaterialXRenderGlsl/GLCocoaWrappers.h>
 #endif
 
 #include <MaterialXRenderGlsl/External/Glad/glad.h>
@@ -130,7 +130,7 @@ GLContext::GLContext(const SimpleWindowPtr window, HardwareContextHandle sharedW
     _isValid(false)
 {
     void* pixelFormat = NSOpenGLChoosePixelFormatWrapper(true, 0, 32, 24, 8, 0, 0, false,
-        false, false, false, false);
+                                                         false, false, false, false);
     if (!pixelFormat)
     {
         return;
diff --git a/source/MaterialXRenderGlsl/GLContext.h b/source/MaterialXRenderGlsl/GLContext.h
index 733778d3c7..f4e4dc1b31 100644
--- a/source/MaterialXRenderGlsl/GLContext.h
+++ b/source/MaterialXRenderGlsl/GLContext.h
@@ -14,9 +14,9 @@
 #include <MaterialXRenderHw/SimpleWindow.h>
 
 #if defined(__APPLE__)
-#include <OpenGL/gl.h>
+    #include <OpenGL/gl.h>
 #elif defined(__linux__) || defined(__FreeBSD__)
-#include <GL/glx.h>
+    #include <GL/glx.h>
 #endif
 
 MATERIALX_NAMESPACE_BEGIN
diff --git a/source/MaterialXRenderGlsl/GLFramebuffer.cpp b/source/MaterialXRenderGlsl/GLFramebuffer.cpp
index bb8e567c58..9516e9ad43 100644
--- a/source/MaterialXRenderGlsl/GLFramebuffer.cpp
+++ b/source/MaterialXRenderGlsl/GLFramebuffer.cpp
@@ -75,33 +75,33 @@ GLFramebuffer::GLFramebuffer(unsigned int width, unsigned int height, unsigned i
         string errorMessage;
         switch (status)
         {
-        case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
-            errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT";
-            break;
-        case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
-            errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT";
-            break;
-        case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
-            errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER";
-            break;
-        case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
-            errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER";
-            break;
-        case GL_FRAMEBUFFER_UNSUPPORTED:
-            errorMessage = "GL_FRAMEBUFFER_UNSUPPORTED";
-            break;
-        case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
-            errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE";
-            break;
-        case GL_FRAMEBUFFER_UNDEFINED:
-            errorMessage = "GL_FRAMEBUFFER_UNDEFINED";
-            break;
-        case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS:
-            errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS";
-            break;
-        default:
-            errorMessage = std::to_string(status);
-            break;
+            case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+                errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT";
+                break;
+            case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+                errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT";
+                break;
+            case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
+                errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER";
+                break;
+            case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
+                errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER";
+                break;
+            case GL_FRAMEBUFFER_UNSUPPORTED:
+                errorMessage = "GL_FRAMEBUFFER_UNSUPPORTED";
+                break;
+            case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
+                errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE";
+                break;
+            case GL_FRAMEBUFFER_UNDEFINED:
+                errorMessage = "GL_FRAMEBUFFER_UNDEFINED";
+                break;
+            case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS:
+                errorMessage = "GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS";
+                break;
+            default:
+                errorMessage = std::to_string(status);
+                break;
         }
 
         throw ExceptionRenderError("Frame buffer object setup failed: " + errorMessage);
diff --git a/source/MaterialXRenderGlsl/GLTextureHandler.h b/source/MaterialXRenderGlsl/GLTextureHandler.h
index 4485ab98eb..942d6dc446 100644
--- a/source/MaterialXRenderGlsl/GLTextureHandler.h
+++ b/source/MaterialXRenderGlsl/GLTextureHandler.h
@@ -33,7 +33,7 @@ class MX_RENDERGLSL_API GLTextureHandler : public ImageHandler
     /// will fail if there are not enough available image units to bind to.
     bool bindImage(ImagePtr image, const ImageSamplingProperties& samplingProperties) override;
 
-    /// Unbind an image. 
+    /// Unbind an image.
     bool unbindImage(ImagePtr image) override;
 
     /// Create rendering resources for the given image.
diff --git a/source/MaterialXRenderGlsl/GlslMaterial.cpp b/source/MaterialXRenderGlsl/GlslMaterial.cpp
index ce4582d44f..84668d2d0a 100644
--- a/source/MaterialXRenderGlsl/GlslMaterial.cpp
+++ b/source/MaterialXRenderGlsl/GlslMaterial.cpp
@@ -38,7 +38,7 @@ bool GlslMaterial::loadSource(const FilePath& vertexShaderFile, const FilePath&
     }
 
     // TODO:
-    // Here we set new source code on the _glProgram without rebuilding 
+    // Here we set new source code on the _glProgram without rebuilding
     // the _hwShader instance. So the _hwShader is not in sync with the
     // _glProgram after this operation.
     _glProgram = GlslProgram::create();
diff --git a/source/MaterialXRenderGlsl/GlslMaterial.h b/source/MaterialXRenderGlsl/GlslMaterial.h
index 1e3d0f7f3b..1ae945867a 100644
--- a/source/MaterialXRenderGlsl/GlslMaterial.h
+++ b/source/MaterialXRenderGlsl/GlslMaterial.h
@@ -24,7 +24,8 @@ using GlslMaterialPtr = std::shared_ptr<class GlslMaterial>;
 class MX_RENDERGLSL_API GlslMaterial : public ShaderMaterial
 {
   public:
-    GlslMaterial() : ShaderMaterial()
+    GlslMaterial() :
+        ShaderMaterial()
     {
     }
     ~GlslMaterial() { }
@@ -45,7 +46,7 @@ class MX_RENDERGLSL_API GlslMaterial : public ShaderMaterial
 
     /// Generate a shader from the given hardware shader.
     bool generateShader(ShaderPtr hwShader) override;
-    
+
     /// Copy shader from one material to this one
     void copyShader(MaterialPtr material) override
     {
diff --git a/source/MaterialXRenderGlsl/GlslProgram.cpp b/source/MaterialXRenderGlsl/GlslProgram.cpp
index 900cac0ef1..4497019e91 100644
--- a/source/MaterialXRenderGlsl/GlslProgram.cpp
+++ b/source/MaterialXRenderGlsl/GlslProgram.cpp
@@ -59,7 +59,7 @@ void GlslProgram::setStages(ShaderPtr shader)
 
     // Extract out the shader code per stage
     _shader = shader;
-    for (size_t i =0; i<shader->numStages(); ++i)
+    for (size_t i = 0; i < shader->numStages(); ++i)
     {
         const ShaderStage& stage = shader->getStage(i);
         addStage(stage.getName(), stage.getSourceCode());
@@ -101,7 +101,7 @@ void GlslProgram::build()
 
     // Compile vertex shader, if any
     GLuint vertexShaderId = UNDEFINED_OPENGL_RESOURCE_ID;
-    const string &vertexShaderSource = _stages[Stage::VERTEX];
+    const string& vertexShaderSource = _stages[Stage::VERTEX];
     if (!vertexShaderSource.empty())
     {
         vertexShaderId = glCreateShader(GL_VERTEX_SHADER);
@@ -138,7 +138,7 @@ void GlslProgram::build()
         fragmentShaderId = glCreateShader(GL_FRAGMENT_SHADER);
 
         // Compile fragment shader
-        const char *fragmentChar = fragmentShaderSource.c_str();
+        const char* fragmentChar = fragmentShaderSource.c_str();
         glShaderSource(fragmentShaderId, 1, &fragmentChar, nullptr);
         glCompileShader(fragmentShaderId);
 
@@ -324,7 +324,7 @@ void GlslProgram::bindPartition(MeshPartitionPtr part)
 
 void GlslProgram::bindMesh(MeshPtr mesh)
 {
-    _enabledStreamLocations.clear(); 
+    _enabledStreamLocations.clear();
 
     if (_programId == UNDEFINED_OPENGL_RESOURCE_ID)
     {
@@ -547,7 +547,7 @@ void GlslProgram::bindTextures(ImageHandlerPtr imageHandler)
 
             // Always bind a texture unless it is a lighting texture.
             // Lighting textures are handled in the bindLighting() call.
-            // If no texture can be loaded then the default color defined in 
+            // If no texture can be loaded then the default color defined in
             // "samplingProperties" will be used to create a fallback texture.
             if (fileName != HW::ENV_RADIANCE &&
                 fileName != HW::ENV_IRRADIANCE)
@@ -903,7 +903,7 @@ const GlslProgram::InputMap& GlslProgram::updateUniformsList()
 
         // Process constants
         const VariableBlock& constants = ps.getConstantBlock();
-        for (size_t i=0; i< constants.size(); ++i)
+        for (size_t i = 0; i < constants.size(); ++i)
         {
             const ShaderPort* v = constants[i];
             // There is no way to match with an unnamed variable
@@ -1197,9 +1197,9 @@ void GlslProgram::printUniforms(std::ostream& outputStream)
         string colorspace = input.second->colorspace;
         bool isConstant = input.second->isConstant;
         outputStream << "Program Uniform: \"" << input.first
-            << "\". Location:" << location
-            << ". GLtype: " << std::hex << gltype
-            << ". Size: " << std::dec << size;
+                     << "\". Location:" << location
+                     << ". GLtype: " << std::hex << gltype
+                     << ". Size: " << std::dec << size;
         if (!type.empty())
             outputStream << ". TypeString: \"" << type << "\"";
         if (!value.empty())
@@ -1217,7 +1217,6 @@ void GlslProgram::printUniforms(std::ostream& outputStream)
     }
 }
 
-
 void GlslProgram::printAttributes(std::ostream& outputStream)
 {
     updateAttributesList();
@@ -1229,9 +1228,9 @@ void GlslProgram::printAttributes(std::ostream& outputStream)
         string type = input.second->typeString;
         string value = input.second->value ? input.second->value->getValueString() : EMPTY_STRING;
         outputStream << "Program Attribute: \"" << input.first
-            << "\". Location:" << location
-            << ". GLtype: " << std::hex << gltype
-            << ". Size: " << std::dec << size;
+                     << "\". Location:" << location
+                     << ". GLtype: " << std::hex << gltype
+                     << ". Size: " << std::dec << size;
         if (!type.empty())
             outputStream << ". TypeString: \"" << type << "\"";
         if (!value.empty())
diff --git a/source/MaterialXRenderGlsl/GlslProgram.h b/source/MaterialXRenderGlsl/GlslProgram.h
index 2538c63fcb..08b5dc7cd5 100644
--- a/source/MaterialXRenderGlsl/GlslProgram.h
+++ b/source/MaterialXRenderGlsl/GlslProgram.h
@@ -109,7 +109,7 @@ class MX_RENDERGLSL_API GlslProgram
         string path;
         /// Unit
         string unit;
-        /// Colorspace 
+        /// Colorspace
         string colorspace;
 
         /// Program input constructor
@@ -119,7 +119,8 @@ class MX_RENDERGLSL_API GlslProgram
             size(inputSize),
             isConstant(false),
             path(inputPath)
-        { }
+        {
+        }
     };
     /// Program input structure shared pointer type
     using InputPtr = std::shared_ptr<Input>;
diff --git a/source/MaterialXRenderGlsl/GlslRenderer.h b/source/MaterialXRenderGlsl/GlslRenderer.h
index 9ea121aec9..bdf16b44b3 100644
--- a/source/MaterialXRenderGlsl/GlslRenderer.h
+++ b/source/MaterialXRenderGlsl/GlslRenderer.h
@@ -50,7 +50,7 @@ class MX_RENDERGLSL_API GlslRenderer : public ShaderRenderer
     {
         return GLTextureHandler::create(imageLoader);
     }
-    
+
     /// Destructor
     virtual ~GlslRenderer() { }
 
diff --git a/source/MaterialXRenderGlsl/TextureBaker.h b/source/MaterialXRenderGlsl/TextureBaker.h
index be1f713cd6..c084b00a1a 100644
--- a/source/MaterialXRenderGlsl/TextureBaker.h
+++ b/source/MaterialXRenderGlsl/TextureBaker.h
@@ -37,7 +37,7 @@ class MX_RENDERGLSL_API TextureBakerGlsl : public TextureBaker<GlslRenderer, Gls
     {
         return TextureBakerPtr(new TextureBakerGlsl(width, height, baseType));
     }
-    
+
     TextureBakerGlsl(unsigned int width, unsigned int height, Image::BaseType baseType);
 };