diff --git a/libraries/bxdf/genglsl/gltf_pbr.mtlx b/libraries/bxdf/genglsl/gltf_pbr.mtlx
index 73504326bc..c60c566b0b 100644
--- a/libraries/bxdf/genglsl/gltf_pbr.mtlx
+++ b/libraries/bxdf/genglsl/gltf_pbr.mtlx
@@ -308,7 +308,7 @@
       <input name="in" type="vector3" nodename="rotate_tangent" />
     </normalize>
     <absval name="abs_anisotropy_rotation" type="float">
-      <input name="in" type="float" interfacename="anisotropy_rotation"/>
+      <input name="in" type="float" interfacename="anisotropy_rotation" />
     </absval>
     <ifgreater name="selected_tangent" type="vector3">
       <input name="value1" type="float" nodename="abs_anisotropy_rotation" />
diff --git a/libraries/bxdf/genglsl/open_pbr_surface.mtlx b/libraries/bxdf/genglsl/open_pbr_surface.mtlx
index c57d30fe1a..85d8717d4e 100644
--- a/libraries/bxdf/genglsl/open_pbr_surface.mtlx
+++ b/libraries/bxdf/genglsl/open_pbr_surface.mtlx
@@ -211,21 +211,21 @@
     </multiply>
 
     <!-- Dielectric Base -->
-      <!-- apply IOR ratio inversion method to avoid TIR artifact (as in Coat TIR section of spec) -->
-      <divide name="specular_to_coat_ior_ratio" type="float">
-         <input name="in1" type="float" interfacename="specular_ior" />
-         <input name="in2" type="float" interfacename="coat_ior" />
-      </divide>
-      <divide name="coat_to_specular_ior_ratio" type="float">
-         <input name="in1" type="float" interfacename="coat_ior" />
-         <input name="in2" type="float" interfacename="specular_ior" />
-      </divide>
-      <ifgreater name="specular_to_coat_ior_ratio_tir_fix" type="float">
-         <input name="value1" type="float" nodename="specular_to_coat_ior_ratio" />
-         <input name="value2" type="float" value="1.0" />
-         <input name="in1" type="float" nodename="specular_to_coat_ior_ratio" />
-         <input name="in2" type="float" nodename="coat_to_specular_ior_ratio" />
-      </ifgreater>
+    <!-- apply IOR ratio inversion method to avoid TIR artifact (as in Coat TIR section of spec) -->
+    <divide name="specular_to_coat_ior_ratio" type="float">
+      <input name="in1" type="float" interfacename="specular_ior" />
+      <input name="in2" type="float" interfacename="coat_ior" />
+    </divide>
+    <divide name="coat_to_specular_ior_ratio" type="float">
+      <input name="in1" type="float" interfacename="coat_ior" />
+      <input name="in2" type="float" interfacename="specular_ior" />
+    </divide>
+    <ifgreater name="specular_to_coat_ior_ratio_tir_fix" type="float">
+      <input name="value1" type="float" nodename="specular_to_coat_ior_ratio" />
+      <input name="value2" type="float" value="1.0" />
+      <input name="in1" type="float" nodename="specular_to_coat_ior_ratio" />
+      <input name="in2" type="float" nodename="coat_to_specular_ior_ratio" />
+    </ifgreater>
     <mix name="eta_s" type="float">
       <input name="fg" type="float" nodename="specular_to_coat_ior_ratio_tir_fix" />
       <input name="bg" type="float" interfacename="specular_ior" />
@@ -546,8 +546,7 @@
   <!--
     OpenPBR Anisotropy node definition
   -->
-  <nodedef name="ND_open_pbr_anisotropy" node="open_pbr_anisotropy" nodegroup="pbr"
-           doc="Computes anisotropic surface roughness as defined in the OpenPBR specification.">
+  <nodedef name="ND_open_pbr_anisotropy" node="open_pbr_anisotropy" nodegroup="pbr" doc="Computes anisotropic surface roughness as defined in the OpenPBR specification.">
     <input name="roughness" type="float" value="0.0" />
     <input name="anisotropy" type="float" value="0.0" />
     <output name="out" type="vector2" />
diff --git a/libraries/bxdf/genmdl/open_pbr_surface.mtlx b/libraries/bxdf/genmdl/open_pbr_surface.mtlx
index bbdb1cc9bc..d040812085 100644
--- a/libraries/bxdf/genmdl/open_pbr_surface.mtlx
+++ b/libraries/bxdf/genmdl/open_pbr_surface.mtlx
@@ -210,21 +210,21 @@
     </multiply>
 
     <!-- Dielectric Base -->
-      <!-- apply IOR ratio inversion method to avoid TIR artifact (as in Coat TIR section of spec) -->
-      <divide name="specular_to_coat_ior_ratio" type="float">
-         <input name="in1" type="float" interfacename="specular_ior" />
-         <input name="in2" type="float" interfacename="coat_ior" />
-      </divide>
-      <divide name="coat_to_specular_ior_ratio" type="float">
-         <input name="in1" type="float" interfacename="coat_ior" />
-         <input name="in2" type="float" interfacename="specular_ior" />
-      </divide>
-      <ifgreater name="specular_to_coat_ior_ratio_tir_fix" type="float">
-         <input name="value1" type="float" nodename="specular_to_coat_ior_ratio" />
-         <input name="value2" type="float" value="1.0" />
-         <input name="in1" type="float" nodename="specular_to_coat_ior_ratio" />
-         <input name="in2" type="float" nodename="coat_to_specular_ior_ratio" />
-      </ifgreater>
+    <!-- apply IOR ratio inversion method to avoid TIR artifact (as in Coat TIR section of spec) -->
+    <divide name="specular_to_coat_ior_ratio" type="float">
+      <input name="in1" type="float" interfacename="specular_ior" />
+      <input name="in2" type="float" interfacename="coat_ior" />
+    </divide>
+    <divide name="coat_to_specular_ior_ratio" type="float">
+      <input name="in1" type="float" interfacename="coat_ior" />
+      <input name="in2" type="float" interfacename="specular_ior" />
+    </divide>
+    <ifgreater name="specular_to_coat_ior_ratio_tir_fix" type="float">
+      <input name="value1" type="float" nodename="specular_to_coat_ior_ratio" />
+      <input name="value2" type="float" value="1.0" />
+      <input name="in1" type="float" nodename="specular_to_coat_ior_ratio" />
+      <input name="in2" type="float" nodename="coat_to_specular_ior_ratio" />
+    </ifgreater>
     <mix name="eta_s" type="float">
       <input name="fg" type="float" nodename="specular_to_coat_ior_ratio_tir_fix" />
       <input name="bg" type="float" interfacename="specular_ior" />
@@ -326,7 +326,7 @@
     <layer name="dielectric_base_tf" type="BSDF">
       <input name="top" type="BSDF" nodename="dielectric_reflection_tf" />
       <input name="base" type="BSDF" nodename="dielectric_substrate" />
-    </layer >
+    </layer>
     <layer name="dielectric_base_notf" type="BSDF">
       <input name="top" type="BSDF" nodename="dielectric_reflection" />
       <input name="base" type="BSDF" nodename="dielectric_substrate" />
@@ -543,8 +543,7 @@
   <!--
     OpenPBR Anisotropy node definition
   -->
-  <nodedef name="ND_open_pbr_anisotropy" node="open_pbr_anisotropy" nodegroup="pbr"
-           doc="Computes anisotropic surface roughness as defined in the OpenPBR specification.">
+  <nodedef name="ND_open_pbr_anisotropy" node="open_pbr_anisotropy" nodegroup="pbr" doc="Computes anisotropic surface roughness as defined in the OpenPBR specification.">
     <input name="roughness" type="float" value="0.0" />
     <input name="anisotropy" type="float" value="0.0" />
     <output name="out" type="vector2" />
diff --git a/libraries/bxdf/gltf_pbr.mtlx b/libraries/bxdf/gltf_pbr.mtlx
index 821506394c..3675bae4c6 100644
--- a/libraries/bxdf/gltf_pbr.mtlx
+++ b/libraries/bxdf/gltf_pbr.mtlx
@@ -353,7 +353,7 @@
       <input name="in" type="vector3" nodename="rotate_tangent" />
     </normalize>
     <absval name="abs_anisotropy_rotation" type="float">
-      <input name="in" type="float" interfacename="anisotropy_rotation"/>
+      <input name="in" type="float" interfacename="anisotropy_rotation" />
     </absval>
     <ifgreater name="selected_tangent" type="vector3">
       <input name="value1" type="float" nodename="abs_anisotropy_rotation" />
diff --git a/libraries/bxdf/lama/lama_iridescence.mtlx b/libraries/bxdf/lama/lama_iridescence.mtlx
index 7728f96d10..5383f5f2ab 100644
--- a/libraries/bxdf/lama/lama_iridescence.mtlx
+++ b/libraries/bxdf/lama/lama_iridescence.mtlx
@@ -72,7 +72,7 @@
     <rotate3d name="tangent_rotate" type="vector3">
       <input name="in" type="vector3" interfacename="anisotropyDirection" />
       <input name="amount" type="float" nodename="tangent_rotate_degree_offset" />
-      <input name="axis" type="vector3" nodename="tangent_normal" /> />
+      <input name="axis" type="vector3" nodename="tangent_normal" />
     </rotate3d>
     <normalize name="tangent_rotate_normalize" type="vector3">
       <input name="in" type="vector3" nodename="tangent_rotate" />
diff --git a/libraries/bxdf/open_pbr_surface.mtlx b/libraries/bxdf/open_pbr_surface.mtlx
index 87084bf7fe..2728d470df 100644
--- a/libraries/bxdf/open_pbr_surface.mtlx
+++ b/libraries/bxdf/open_pbr_surface.mtlx
@@ -301,21 +301,21 @@
     </multiply>
 
     <!-- Dielectric Base -->
-      <!-- apply IOR ratio inversion method to avoid TIR artifact (as in Coat TIR section of spec) -->
-      <divide name="specular_to_coat_ior_ratio" type="float">
-         <input name="in1" type="float" interfacename="specular_ior" />
-         <input name="in2" type="float" interfacename="coat_ior" />
-      </divide>
-      <divide name="coat_to_specular_ior_ratio" type="float">
-         <input name="in1" type="float" interfacename="coat_ior" />
-         <input name="in2" type="float" interfacename="specular_ior" />
-      </divide>
-      <ifgreater name="specular_to_coat_ior_ratio_tir_fix" type="float">
-         <input name="value1" type="float" nodename="specular_to_coat_ior_ratio" />
-         <input name="value2" type="float" value="1.0" />
-         <input name="in1" type="float" nodename="specular_to_coat_ior_ratio" />
-         <input name="in2" type="float" nodename="coat_to_specular_ior_ratio" />
-      </ifgreater>
+    <!-- apply IOR ratio inversion method to avoid TIR artifact (as in Coat TIR section of spec) -->
+    <divide name="specular_to_coat_ior_ratio" type="float">
+      <input name="in1" type="float" interfacename="specular_ior" />
+      <input name="in2" type="float" interfacename="coat_ior" />
+    </divide>
+    <divide name="coat_to_specular_ior_ratio" type="float">
+      <input name="in1" type="float" interfacename="coat_ior" />
+      <input name="in2" type="float" interfacename="specular_ior" />
+    </divide>
+    <ifgreater name="specular_to_coat_ior_ratio_tir_fix" type="float">
+      <input name="value1" type="float" nodename="specular_to_coat_ior_ratio" />
+      <input name="value2" type="float" value="1.0" />
+      <input name="in1" type="float" nodename="specular_to_coat_ior_ratio" />
+      <input name="in2" type="float" nodename="coat_to_specular_ior_ratio" />
+    </ifgreater>
     <mix name="eta_s" type="float">
       <input name="fg" type="float" nodename="specular_to_coat_ior_ratio_tir_fix" />
       <input name="bg" type="float" interfacename="specular_ior" />
diff --git a/libraries/bxdf/translation/open_pbr_to_standard_surface.mtlx b/libraries/bxdf/translation/open_pbr_to_standard_surface.mtlx
index ec7bb19a98..f9ca1cd446 100644
--- a/libraries/bxdf/translation/open_pbr_to_standard_surface.mtlx
+++ b/libraries/bxdf/translation/open_pbr_to_standard_surface.mtlx
@@ -53,7 +53,7 @@
     <output name="diffuse_roughness_out" type="float" />
     <output name="metalness_out" type="float" />
 
-    <output name="specular_out" type="float"/>
+    <output name="specular_out" type="float" />
     <output name="specular_color_out" type="color3" />
     <output name="specular_roughness_out" type="float" />
     <output name="specular_IOR_out" type="float" />
diff --git a/libraries/bxdf/translation/standard_surface_to_open_pbr.mtlx b/libraries/bxdf/translation/standard_surface_to_open_pbr.mtlx
index 535f65b700..4edc743966 100644
--- a/libraries/bxdf/translation/standard_surface_to_open_pbr.mtlx
+++ b/libraries/bxdf/translation/standard_surface_to_open_pbr.mtlx
@@ -14,12 +14,12 @@
     <input name="specular_anisotropy" type="float" value="0" />
 
     <input name="transmission" type="float" value="0" />
-    <input name="transmission_color" type="color3" value="1, 1, 1"/>
+    <input name="transmission_color" type="color3" value="1, 1, 1" />
     <input name="transmission_depth" type="float" value="0" />
     <input name="transmission_scatter" type="color3" value="0, 0, 0" />
     <input name="transmission_scatter_anisotropy" type="float" value="0" />
     <input name="transmission_dispersion" type="float" value="0" />
-    
+
     <input name="subsurface" type="float" value="0" uimin="0.0" />
     <input name="subsurface_color" type="color3" value="1, 1, 1" />
     <input name="subsurface_radius" type="color3" value="1, 1, 1" />
@@ -36,7 +36,7 @@
     <input name="coat_anisotropy" type="float" value="0.0" />
     <input name="coat_IOR" type="float" value="1.5" />
     <input name="coat_affect_roughness" type="float" value="0" />
-    
+
     <input name="thin_film_thickness" type="float" value="0" />
     <input name="thin_film_IOR" type="float" value="1.5" />
 
@@ -64,7 +64,7 @@
     <output name="transmission_scatter_out" type="color3" />
     <output name="transmission_scatter_anisotropy_out" type="float" />
     <output name="transmission_dispersion_scale_out" type="float" />
-    
+
     <output name="subsurface_weight_out" type="float" />
     <output name="subsurface_color_out" type="color3" />
     <output name="subsurface_radius_out" type="float" />
@@ -132,7 +132,7 @@
     </dotproduct>
     <!--Intentionally ignoring the original specular_color input for metals, since the translation between these concepts will take more thought.-->
     <ifequal name="specColor" type="color3">
-      <input name="value1" type="float" value="0.0"  />
+      <input name="value1" type="float" value="0.0" />
       <input name="value2" type="float" nodename="dotProd" />
       <input name="in1" type="color3" value="1.0, 1.0, 1.0" />
       <input name="in2" type="color3" interfacename="specular_color" />
@@ -271,7 +271,7 @@
     <output name="specular_roughness_out" type="float" nodename="specRoughness" />
     <output name="specular_ior_out" type="float" nodename="specIOR" />
     <output name="specular_roughness_anisotropy_out" type="float" nodename="specRoughnessAnisotropy" />
-    
+
     <output name="transmission_weight_out" type="float" nodename="transmissionWeight" />
     <output name="transmission_color_out" type="color3" nodename="transmissionColor" />
     <output name="transmission_depth_out" type="float" nodename="transmissionDepth" />
diff --git a/libraries/bxdf/usd_preview_surface.mtlx b/libraries/bxdf/usd_preview_surface.mtlx
index 23a01462a7..657921ee9b 100644
--- a/libraries/bxdf/usd_preview_surface.mtlx
+++ b/libraries/bxdf/usd_preview_surface.mtlx
@@ -64,12 +64,12 @@
   <nodedef name="ND_UsdPrimvarReader_string" nodegroup="geometric" node="UsdPrimvarReader">
     <input name="varname" type="string" value="" uniform="true" />
     <input name="fallback" type="string" value="" uniform="true" />
-    <output name="out" type="string" uniform="true"/>
+    <output name="out" type="string" uniform="true" />
   </nodedef>
   <nodedef name="ND_UsdPrimvarReader_filename" nodegroup="geometric" node="UsdPrimvarReader">
     <input name="varname" type="string" value="" uniform="true" />
     <input name="fallback" type="filename" value="" uniform="true" />
-    <output name="out" type="filename" uniform="true"/>
+    <output name="out" type="filename" uniform="true" />
   </nodedef>
   <nodedef name="ND_UsdPrimvarReader_float" nodegroup="geometric" node="UsdPrimvarReader">
     <input name="varname" type="string" value="" uniform="true" />
diff --git a/libraries/cmlib/cmlib_ng.mtlx b/libraries/cmlib/cmlib_ng.mtlx
index 7271bd944b..4f37d0a5dd 100644
--- a/libraries/cmlib/cmlib_ng.mtlx
+++ b/libraries/cmlib/cmlib_ng.mtlx
@@ -315,8 +315,7 @@
 
   <nodegraph name="NG_srgb_displayp3_to_lin_rec709_color3" nodedef="ND_srgb_displayp3_to_lin_rec709_color3">
     <constant name="mat" type="matrix33">
-      <input name="value" type="matrix33"
-             value="1.22493029, -0.04205868, -0.01964128, -0.22492968, 1.04205894, -0.07864794, 0.00000006,-0.00000001, 1.09828925"/>
+      <input name="value" type="matrix33" value="1.22493029, -0.04205868, -0.01964128, -0.22492968, 1.04205894, -0.07864794, 0.00000006,-0.00000001, 1.09828925" />
     </constant>
     <!--  Use srgb_texture_to_lin_rec709 to convert from sRGB to Lin before passing to the mat conversion -->
     <srgb_texture_to_lin_rec709 name="srgb_transform" type="color3">
@@ -355,8 +354,7 @@
 
   <nodegraph name="NG_lin_displayp3_to_lin_rec709_color3" nodedef="ND_lin_displayp3_to_lin_rec709_color3">
     <constant name="mat" type="matrix33">
-      <input name="value" type="matrix33"
-             value="1.22493029, -0.04205868, -0.01964128, -0.22492968, 1.04205894, -0.07864794, 0.00000006,-0.00000001, 1.09828925"/>
+      <input name="value" type="matrix33" value="1.22493029, -0.04205868, -0.01964128, -0.22492968, 1.04205894, -0.07864794, 0.00000006,-0.00000001, 1.09828925" />
     </constant>
     <convert name="asVec" type="vector3">
       <input name="in" type="color3" interfacename="in" />
diff --git a/libraries/pbrlib/pbrlib_defs.mtlx b/libraries/pbrlib/pbrlib_defs.mtlx
index 0bb75716e6..039d78bdd6 100644
--- a/libraries/pbrlib/pbrlib_defs.mtlx
+++ b/libraries/pbrlib/pbrlib_defs.mtlx
@@ -430,8 +430,8 @@
   <nodedef name="ND_deon_hair_absorption_from_melanin" node="deon_hair_absorption_from_melanin" nodegroup="pbr" doc="Calculates hair absorption from melanin parameters.">
     <input name="melanin_concentration" type="float" value="0.25" />
     <input name="melanin_redness" type="float" value="0.5" />
-    <input name="eumelanin_color" type="color3" value="0.657704, 0.498077, 0.254107" colorspace="lin_rec709" doc="constant from d'Eon et al. 2011, converted to color via exp(-c)" uiadvanced="true"/>
-    <input name="pheomelanin_color" type="color3" value="0.829444, 0.67032, 0.349938" colorspace="lin_rec709" doc="constant from d'Eon et al. 2011, converted to color via exp(-c)" uiadvanced="true"/>
+    <input name="eumelanin_color" type="color3" value="0.657704, 0.498077, 0.254107" colorspace="lin_rec709" doc="constant from d'Eon et al. 2011, converted to color via exp(-c)" uiadvanced="true" />
+    <input name="pheomelanin_color" type="color3" value="0.829444, 0.67032, 0.349938" colorspace="lin_rec709" doc="constant from d'Eon et al. 2011, converted to color via exp(-c)" uiadvanced="true" />
     <output name="absorption" type="vector3" />
   </nodedef>
 
diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
index 7bfbc3906b..2b281193ca 100644
--- a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
+++ b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx
@@ -732,9 +732,9 @@
   <!-- Logical operator nodes                                                   -->
   <!-- ======================================================================== -->
 
-  <implementation name="IM_logical_and_genglsl" nodedef="ND_logical_and" target="genglsl" sourcecode="{{in1}} && {{in2}}"/>
-  <implementation name="IM_logical_or_genglsl" nodedef="ND_logical_or" target="genglsl" sourcecode="{{in1}} || {{in2}}"/>
-  <implementation name="IM_logical_not_genglsl" nodedef="ND_logical_not" target="genglsl" sourcecode="!{{in}}"/>
+  <implementation name="IM_logical_and_genglsl" nodedef="ND_logical_and" target="genglsl" sourcecode="{{in1}} &amp;&amp; {{in2}}" />
+  <implementation name="IM_logical_or_genglsl" nodedef="ND_logical_or" target="genglsl" sourcecode="{{in1}} || {{in2}}" />
+  <implementation name="IM_logical_not_genglsl" nodedef="ND_logical_not" target="genglsl" sourcecode="!{{in}}" />
 
   <!-- ======================================================================== -->
   <!-- Organization nodes                                                       -->
diff --git a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
index 28e2b35465..24e0587aa3 100644
--- a/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
+++ b/libraries/stdlib/genmdl/stdlib_genmdl_impl.mtlx
@@ -266,8 +266,10 @@
   <implementation name="IM_divide_vector3FA_genmdl" nodedef="ND_divide_vector3FA" sourcecode="{{in1}} / {{in2}}" target="genmdl" />
   <implementation name="IM_divide_vector4_genmdl" nodedef="ND_divide_vector4" sourcecode="{{in1}} / {{in2}}" target="genmdl" />
   <implementation name="IM_divide_vector4FA_genmdl" nodedef="ND_divide_vector4FA" sourcecode="{{in1}} / {{in2}}" target="genmdl" />
-  <implementation name="IM_divide_matrix33_genmdl" nodedef="ND_divide_matrix33" sourcecode="{{in1}}" target="genmdl" /> <!-- TODO: Implement properly -->
-  <implementation name="IM_divide_matrix44_genmdl" nodedef="ND_divide_matrix44" sourcecode="{{in1}}" target="genmdl" /> <!-- TODO: Implement properly -->
+  <!-- TODO: Implement IM_divide_matrix33_genmdl properly -->  
+  <implementation name="IM_divide_matrix33_genmdl" nodedef="ND_divide_matrix33" sourcecode="{{in1}}" target="genmdl" />  
+  <!-- TODO: Implement IM_divide_matrix44_genmdl properly -->
+  <implementation name="IM_divide_matrix44_genmdl" nodedef="ND_divide_matrix44" sourcecode="{{in1}}" target="genmdl" />
 
   <!-- <modulo> -->
   <implementation name="IM_modulo_float_genmdl" nodedef="ND_modulo_float" sourcecode="mx_mod({{in1}}, {{in2}})" target="genmdl" />
@@ -744,9 +746,9 @@
   <!-- Logical operator nodes                                                   -->
   <!-- ======================================================================== -->
 
-  <implementation name="IM_logical_and_genmdl" nodedef="ND_logical_and" target="genmdl" sourcecode="{{in1}} && {{in2}}"/>
-  <implementation name="IM_logical_or_genmdl" nodedef="ND_logical_or" target="genmdl" sourcecode="{{in1}} || {{in2}}"/>
-  <implementation name="IM_logical_not_genmdl" nodedef="ND_logical_not" target="genmdl" sourcecode="!{{in}}"/>
+  <implementation name="IM_logical_and_genmdl" nodedef="ND_logical_and" target="genmdl" sourcecode="{{in1}} &amp;&amp; {{in2}}" />
+  <implementation name="IM_logical_or_genmdl" nodedef="ND_logical_or" target="genmdl" sourcecode="{{in1}} || {{in2}}" />
+  <implementation name="IM_logical_not_genmdl" nodedef="ND_logical_not" target="genmdl" sourcecode="!{{in}}" />
 
   <!-- ======================================================================== -->
   <!-- Organization nodes                                                       -->
diff --git a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
index 81da6169ae..c0b647dca9 100644
--- a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
+++ b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
@@ -722,9 +722,9 @@
   <!-- Logical operator nodes                                                   -->
   <!-- ======================================================================== -->
 
-  <implementation name="IM_logical_and_genosl" nodedef="ND_logical_and" target="genosl" sourcecode="{{in1}} && {{in2}}"/>
-  <implementation name="IM_logical_or_genosl" nodedef="ND_logical_or" target="genosl" sourcecode="{{in1}} || {{in2}}"/>
-  <implementation name="IM_logical_not_genosl" nodedef="ND_logical_not" target="genosl" sourcecode="!{{in}}"/>
+  <implementation name="IM_logical_and_genosl" nodedef="ND_logical_and" target="genosl" sourcecode="{{in1}} &amp;&amp; {{in2}}" />
+  <implementation name="IM_logical_or_genosl" nodedef="ND_logical_or" target="genosl" sourcecode="{{in1}} || {{in2}}" />
+  <implementation name="IM_logical_not_genosl" nodedef="ND_logical_not" target="genosl" sourcecode="!{{in}}" />
 
   <!-- ======================================================================== -->
   <!-- Organization nodes                                                       -->
diff --git a/libraries/stdlib/stdlib_defs.mtlx b/libraries/stdlib/stdlib_defs.mtlx
index 499b91d890..058f93da96 100644
--- a/libraries/stdlib/stdlib_defs.mtlx
+++ b/libraries/stdlib/stdlib_defs.mtlx
@@ -303,7 +303,7 @@
     <input name="rotation" type="float" value="0.0" unittype="angle" unit="degree" uimin="0" uimax="360" uiname="Longitude Offset" />
     <output name="out" type="color3" default="0.0, 0.0, 0.0" />
   </nodedef>
-  
+
   <!--
     Node: <hextiledimage> Supplemental Node
     Samples data from a single image, with provisions for hex-tiling and randomizing the image
@@ -1583,7 +1583,8 @@
     The current time in seconds as defined by the host environment.
   -->
   <nodedef name="ND_time_float" node="time" nodegroup="application">
-    <input name="fps" type="float" value="24.0" /> <!-- An unused input, to be removed in a future specification version -->
+    <input name="fps" type="float" value="24.0" />
+    <!-- An unused input, to be removed in a future specification version -->
     <output name="out" type="float" default="0.0" />
   </nodedef>
 
@@ -4970,7 +4971,7 @@
   -->
   <nodedef name="ND_heighttonormal_vector3" node="heighttonormal" nodegroup="convolution2d">
     <input name="in" type="float" value="0.0" />
-    <input name="scale" type="float" value="1.0" uimin="0.0" uisoftmax="5.0"/>
+    <input name="scale" type="float" value="1.0" uimin="0.0" uisoftmax="5.0" />
     <input name="texcoord" type="vector2" defaultgeomprop="UV0" />
     <output name="out" type="vector3" default="0.5, 0.5, 1.0" />
   </nodedef>
@@ -5015,7 +5016,7 @@
   -->
   <nodedef name="ND_logical_not" node="not" nodegroup="conditional">
     <input name="in" type="boolean" value="false" />
-    <output name="out" type="boolean" default="true"/>
+    <output name="out" type="boolean" default="true" />
   </nodedef>
 
   <!-- ======================================================================== -->
diff --git a/libraries/stdlib/stdlib_ng.mtlx b/libraries/stdlib/stdlib_ng.mtlx
index 08025aedd2..0e4907a012 100644
--- a/libraries/stdlib/stdlib_ng.mtlx
+++ b/libraries/stdlib/stdlib_ng.mtlx
@@ -1201,7 +1201,7 @@
       <input name="prev_color" type="color4" interfacename="color1" />
       <input name="color2" type="color4" interfacename="color2" />
       <input name="x" type="float" nodename="ramp_type_selector" />
-    </ramp_gradient> 
+    </ramp_gradient>
     <ramp_gradient name="ramp_gradient2" type="color4" nodedef="ND_ramp_gradient">
       <input name="prev_color" type="color4" nodename="ramp_gradient1" />
       <input name="interpolation" type="integer" interfacename="interpolation" />
@@ -1212,7 +1212,7 @@
       <input name="color1" type="color4" interfacename="color2" />
       <input name="color2" type="color4" interfacename="color3" />
       <input name="x" type="float" nodename="ramp_type_selector" />
-    </ramp_gradient> 
+    </ramp_gradient>
     <ramp_gradient name="ramp_gradient3" type="color4" nodedef="ND_ramp_gradient">
       <input name="prev_color" type="color4" nodename="ramp_gradient2" />
       <input name="interpolation" type="integer" interfacename="interpolation" />
@@ -3285,26 +3285,26 @@
       <input name="in" type="color3" interfacename="high" />
     </separate3>
     <smoothstep name="smoothstep_r" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outr"/>
-      <input name="low" type="float" nodename="separate_low" output="outr"/>
-      <input name="high" type="float" nodename="separate_high" output="outr"/>
+      <input name="in" type="float" nodename="separate_in" output="outr" />
+      <input name="low" type="float" nodename="separate_low" output="outr" />
+      <input name="high" type="float" nodename="separate_high" output="outr" />
     </smoothstep>
     <smoothstep name="smoothstep_g" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outg"/>
-      <input name="low" type="float" nodename="separate_low" output="outg"/>
-      <input name="high" type="float" nodename="separate_high" output="outg"/>
+      <input name="in" type="float" nodename="separate_in" output="outg" />
+      <input name="low" type="float" nodename="separate_low" output="outg" />
+      <input name="high" type="float" nodename="separate_high" output="outg" />
     </smoothstep>
     <smoothstep name="smoothstep_b" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outb"/>
-      <input name="low" type="float" nodename="separate_low" output="outb"/>
-      <input name="high" type="float" nodename="separate_high" output="outb"/>
+      <input name="in" type="float" nodename="separate_in" output="outb" />
+      <input name="low" type="float" nodename="separate_low" output="outb" />
+      <input name="high" type="float" nodename="separate_high" output="outb" />
     </smoothstep>
     <combine3 name="combine" type="color3">
-      <input name="in1" type="float" nodename="smoothstep_r"/>
-      <input name="in2" type="float" nodename="smoothstep_g"/>
-      <input name="in3" type="float" nodename="smoothstep_b"/>
+      <input name="in1" type="float" nodename="smoothstep_r" />
+      <input name="in2" type="float" nodename="smoothstep_g" />
+      <input name="in3" type="float" nodename="smoothstep_b" />
     </combine3>
-    <output name="out" type="color3" nodename="combine"/>
+    <output name="out" type="color3" nodename="combine" />
   </nodegraph>
   <nodegraph name="NG_smoothstep_color4" nodedef="ND_smoothstep_color4">
     <separate4 name="separate_in" type="multioutput">
@@ -3317,264 +3317,264 @@
       <input name="in" type="color4" interfacename="high" />
     </separate4>
     <smoothstep name="smoothstep_r" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outr"/>
-      <input name="low" type="float" nodename="separate_low" output="outr"/>
-      <input name="high" type="float" nodename="separate_high" output="outr"/>
+      <input name="in" type="float" nodename="separate_in" output="outr" />
+      <input name="low" type="float" nodename="separate_low" output="outr" />
+      <input name="high" type="float" nodename="separate_high" output="outr" />
     </smoothstep>
     <smoothstep name="smoothstep_g" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outg"/>
-      <input name="low" type="float" nodename="separate_low" output="outg"/>
-      <input name="high" type="float" nodename="separate_high" output="outg"/>
+      <input name="in" type="float" nodename="separate_in" output="outg" />
+      <input name="low" type="float" nodename="separate_low" output="outg" />
+      <input name="high" type="float" nodename="separate_high" output="outg" />
     </smoothstep>
     <smoothstep name="smoothstep_b" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outb"/>
-      <input name="low" type="float" nodename="separate_low" output="outb"/>
-      <input name="high" type="float" nodename="separate_high" output="outb"/>
+      <input name="in" type="float" nodename="separate_in" output="outb" />
+      <input name="low" type="float" nodename="separate_low" output="outb" />
+      <input name="high" type="float" nodename="separate_high" output="outb" />
     </smoothstep>
     <smoothstep name="smoothstep_a" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outa"/>
-      <input name="low" type="float" nodename="separate_low" output="outa"/>
-      <input name="high" type="float" nodename="separate_high" output="outa"/>
+      <input name="in" type="float" nodename="separate_in" output="outa" />
+      <input name="low" type="float" nodename="separate_low" output="outa" />
+      <input name="high" type="float" nodename="separate_high" output="outa" />
     </smoothstep>
     <combine4 name="combine" type="color4">
-      <input name="in1" type="float" nodename="smoothstep_r"/>
-      <input name="in2" type="float" nodename="smoothstep_g"/>
-      <input name="in3" type="float" nodename="smoothstep_b"/>
-      <input name="in4" type="float" nodename="smoothstep_a"/>
+      <input name="in1" type="float" nodename="smoothstep_r" />
+      <input name="in2" type="float" nodename="smoothstep_g" />
+      <input name="in3" type="float" nodename="smoothstep_b" />
+      <input name="in4" type="float" nodename="smoothstep_a" />
     </combine4>
-    <output name="out" type="color4" nodename="combine"/>
+    <output name="out" type="color4" nodename="combine" />
   </nodegraph>
   <nodegraph name="NG_smoothstep_color3FA" nodedef="ND_smoothstep_color3FA">
     <separate3 name="separate_in" type="multioutput">
       <input name="in" type="color3" interfacename="in" />
     </separate3>
     <smoothstep name="smoothstep_r" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outr"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outr" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <smoothstep name="smoothstep_g" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outg"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outg" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <smoothstep name="smoothstep_b" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outb"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outb" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <combine3 name="combine" type="color3">
-      <input name="in1" type="float" nodename="smoothstep_r"/>
-      <input name="in2" type="float" nodename="smoothstep_g"/>
-      <input name="in3" type="float" nodename="smoothstep_b"/>
+      <input name="in1" type="float" nodename="smoothstep_r" />
+      <input name="in2" type="float" nodename="smoothstep_g" />
+      <input name="in3" type="float" nodename="smoothstep_b" />
     </combine3>
-    <output name="out" type="color3" nodename="combine"/>
+    <output name="out" type="color3" nodename="combine" />
   </nodegraph>
   <nodegraph name="NG_smoothstep_color4FA" nodedef="ND_smoothstep_color4FA">
     <separate4 name="separate_in" type="multioutput">
       <input name="in" type="color4" interfacename="in" />
     </separate4>
     <smoothstep name="smoothstep_r" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outr"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outr" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <smoothstep name="smoothstep_g" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outg"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outg" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <smoothstep name="smoothstep_b" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outb"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outb" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <smoothstep name="smoothstep_a" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outa"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outa" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <combine4 name="combine" type="color4">
-      <input name="in1" type="float" nodename="smoothstep_r"/>
-      <input name="in2" type="float" nodename="smoothstep_g"/>
-      <input name="in3" type="float" nodename="smoothstep_b"/>
-      <input name="in4" type="float" nodename="smoothstep_a"/>
+      <input name="in1" type="float" nodename="smoothstep_r" />
+      <input name="in2" type="float" nodename="smoothstep_g" />
+      <input name="in3" type="float" nodename="smoothstep_b" />
+      <input name="in4" type="float" nodename="smoothstep_a" />
     </combine4>
-    <output name="out" type="color4" nodename="combine"/>
+    <output name="out" type="color4" nodename="combine" />
   </nodegraph>
   <nodegraph name="NG_smoothstep_vector2" nodedef="ND_smoothstep_vector2">
     <separate2 name="separate_in" type="multioutput">
-      <input name="in" type="vector2" interfacename="in"/>
+      <input name="in" type="vector2" interfacename="in" />
     </separate2>
     <separate2 name="separate_low" type="multioutput">
-      <input name="in" type="vector2" interfacename="low"/>
+      <input name="in" type="vector2" interfacename="low" />
     </separate2>
     <separate2 name="separate_high" type="multioutput">
-      <input name="in" type="vector2" interfacename="high"/>
+      <input name="in" type="vector2" interfacename="high" />
     </separate2>
     <smoothstep name="smoothstep_x" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outx"/>
-      <input name="low" type="float" nodename="separate_low" output="outx"/>
-      <input name="high" type="float" nodename="separate_high" output="outx"/>
+      <input name="in" type="float" nodename="separate_in" output="outx" />
+      <input name="low" type="float" nodename="separate_low" output="outx" />
+      <input name="high" type="float" nodename="separate_high" output="outx" />
     </smoothstep>
     <smoothstep name="smoothstep_y" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outy"/>
-      <input name="low" type="float" nodename="separate_low" output="outy"/>
-      <input name="high" type="float" nodename="separate_high" output="outy"/>
+      <input name="in" type="float" nodename="separate_in" output="outy" />
+      <input name="low" type="float" nodename="separate_low" output="outy" />
+      <input name="high" type="float" nodename="separate_high" output="outy" />
     </smoothstep>
     <combine2 name="combine" type="vector2">
-      <input name="in1" type="float" nodename="smoothstep_x"/>
-      <input name="in2" type="float" nodename="smoothstep_y"/>
+      <input name="in1" type="float" nodename="smoothstep_x" />
+      <input name="in2" type="float" nodename="smoothstep_y" />
     </combine2>
-    <output name="out" type="vector2" nodename="combine"/>
+    <output name="out" type="vector2" nodename="combine" />
   </nodegraph>
   <nodegraph name="NG_smoothstep_vector3" nodedef="ND_smoothstep_vector3">
     <separate3 name="separate_in" type="multioutput">
-      <input name="in" type="vector3" interfacename="in"/>
+      <input name="in" type="vector3" interfacename="in" />
     </separate3>
     <separate3 name="separate_low" type="multioutput">
-      <input name="in" type="vector3" interfacename="low"/>
+      <input name="in" type="vector3" interfacename="low" />
     </separate3>
     <separate3 name="separate_high" type="multioutput">
-      <input name="in" type="vector3" interfacename="high"/>
+      <input name="in" type="vector3" interfacename="high" />
     </separate3>
     <smoothstep name="smoothstep_x" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outx"/>
-      <input name="low" type="float" nodename="separate_low" output="outx"/>
-      <input name="high" type="float" nodename="separate_high" output="outx"/>
+      <input name="in" type="float" nodename="separate_in" output="outx" />
+      <input name="low" type="float" nodename="separate_low" output="outx" />
+      <input name="high" type="float" nodename="separate_high" output="outx" />
     </smoothstep>
     <smoothstep name="smoothstep_y" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outy"/>
-      <input name="low" type="float" nodename="separate_low" output="outy"/>
-      <input name="high" type="float" nodename="separate_high" output="outy"/>
+      <input name="in" type="float" nodename="separate_in" output="outy" />
+      <input name="low" type="float" nodename="separate_low" output="outy" />
+      <input name="high" type="float" nodename="separate_high" output="outy" />
     </smoothstep>
     <smoothstep name="smoothstep_z" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outz"/>
-      <input name="low" type="float" nodename="separate_low" output="outz"/>
-      <input name="high" type="float" nodename="separate_high" output="outz"/>
+      <input name="in" type="float" nodename="separate_in" output="outz" />
+      <input name="low" type="float" nodename="separate_low" output="outz" />
+      <input name="high" type="float" nodename="separate_high" output="outz" />
     </smoothstep>
     <combine3 name="combine" type="vector3">
-      <input name="in1" type="float" nodename="smoothstep_x"/>
-      <input name="in2" type="float" nodename="smoothstep_y"/>
-      <input name="in3" type="float" nodename="smoothstep_z"/>
+      <input name="in1" type="float" nodename="smoothstep_x" />
+      <input name="in2" type="float" nodename="smoothstep_y" />
+      <input name="in3" type="float" nodename="smoothstep_z" />
     </combine3>
-    <output name="out" type="vector3" nodename="combine"/>
+    <output name="out" type="vector3" nodename="combine" />
   </nodegraph>
   <nodegraph name="NG_smoothstep_vector4" nodedef="ND_smoothstep_vector4">
     <separate4 name="separate_in" type="multioutput">
-      <input name="in" type="vector4" interfacename="in"/>
+      <input name="in" type="vector4" interfacename="in" />
     </separate4>
     <separate4 name="separate_low" type="multioutput">
-      <input name="in" type="vector4" interfacename="low"/>
+      <input name="in" type="vector4" interfacename="low" />
     </separate4>
     <separate4 name="separate_high" type="multioutput">
-      <input name="in" type="vector4" interfacename="high"/>
+      <input name="in" type="vector4" interfacename="high" />
     </separate4>
     <smoothstep name="smoothstep_x" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outx"/>
-      <input name="low" type="float" nodename="separate_low" output="outx"/>
-      <input name="high" type="float" nodename="separate_high" output="outx"/>
+      <input name="in" type="float" nodename="separate_in" output="outx" />
+      <input name="low" type="float" nodename="separate_low" output="outx" />
+      <input name="high" type="float" nodename="separate_high" output="outx" />
     </smoothstep>
     <smoothstep name="smoothstep_y" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outy"/>
-      <input name="low" type="float" nodename="separate_low" output="outy"/>
-      <input name="high" type="float" nodename="separate_high" output="outy"/>
+      <input name="in" type="float" nodename="separate_in" output="outy" />
+      <input name="low" type="float" nodename="separate_low" output="outy" />
+      <input name="high" type="float" nodename="separate_high" output="outy" />
     </smoothstep>
     <smoothstep name="smoothstep_z" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outz"/>
-      <input name="low" type="float" nodename="separate_low" output="outz"/>
-      <input name="high" type="float" nodename="separate_high" output="outz"/>
+      <input name="in" type="float" nodename="separate_in" output="outz" />
+      <input name="low" type="float" nodename="separate_low" output="outz" />
+      <input name="high" type="float" nodename="separate_high" output="outz" />
     </smoothstep>
     <smoothstep name="smoothstep_w" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outw"/>
-      <input name="low" type="float" nodename="separate_low" output="outw"/>
-      <input name="high" type="float" nodename="separate_high" output="outw"/>
+      <input name="in" type="float" nodename="separate_in" output="outw" />
+      <input name="low" type="float" nodename="separate_low" output="outw" />
+      <input name="high" type="float" nodename="separate_high" output="outw" />
     </smoothstep>
     <combine4 name="combine" type="vector4">
-      <input name="in1" type="float" nodename="smoothstep_x"/>
-      <input name="in2" type="float" nodename="smoothstep_y"/>
-      <input name="in3" type="float" nodename="smoothstep_z"/>
-      <input name="in4" type="float" nodename="smoothstep_w"/>
+      <input name="in1" type="float" nodename="smoothstep_x" />
+      <input name="in2" type="float" nodename="smoothstep_y" />
+      <input name="in3" type="float" nodename="smoothstep_z" />
+      <input name="in4" type="float" nodename="smoothstep_w" />
     </combine4>
-    <output name="out" type="vector4" nodename="combine"/>
+    <output name="out" type="vector4" nodename="combine" />
   </nodegraph>
   <nodegraph name="NG_smoothstep_vector2FA" nodedef="ND_smoothstep_vector2FA">
     <separate2 name="separate_in" type="multioutput">
       <input name="in" type="vector2" interfacename="in" />
     </separate2>
     <smoothstep name="smoothstep_x" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outx"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outx" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <smoothstep name="smoothstep_y" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outy"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outy" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <combine2 name="combine" type="vector2">
-      <input name="in1" type="float" nodename="smoothstep_x"/>
-      <input name="in2" type="float" nodename="smoothstep_y"/>
+      <input name="in1" type="float" nodename="smoothstep_x" />
+      <input name="in2" type="float" nodename="smoothstep_y" />
     </combine2>
-    <output name="out" type="vector2" nodename="combine"/>
+    <output name="out" type="vector2" nodename="combine" />
   </nodegraph>
   <nodegraph name="NG_smoothstep_vector3FA" nodedef="ND_smoothstep_vector3FA">
     <separate3 name="separate_in" type="multioutput">
       <input name="in" type="vector3" interfacename="in" />
     </separate3>
     <smoothstep name="smoothstep_x" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outx"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outx" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <smoothstep name="smoothstep_y" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outy"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outy" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <smoothstep name="smoothstep_z" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outz"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outz" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <combine3 name="combine" type="vector3">
-      <input name="in1" type="float" nodename="smoothstep_x"/>
-      <input name="in2" type="float" nodename="smoothstep_y"/>
-      <input name="in3" type="float" nodename="smoothstep_z"/>
+      <input name="in1" type="float" nodename="smoothstep_x" />
+      <input name="in2" type="float" nodename="smoothstep_y" />
+      <input name="in3" type="float" nodename="smoothstep_z" />
     </combine3>
-    <output name="out" type="vector3" nodename="combine"/>
+    <output name="out" type="vector3" nodename="combine" />
   </nodegraph>
   <nodegraph name="NG_smoothstep_vector4FA" nodedef="ND_smoothstep_vector4FA">
     <separate4 name="separate_in" type="multioutput">
       <input name="in" type="vector4" interfacename="in" />
     </separate4>
     <smoothstep name="smoothstep_x" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outx"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outx" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <smoothstep name="smoothstep_y" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outy"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outy" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <smoothstep name="smoothstep_z" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outz"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outz" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <smoothstep name="smoothstep_w" type="float">
-      <input name="in" type="float" nodename="separate_in" output="outw"/>
-      <input name="low" type="float" interfacename="low"/>
-      <input name="high" type="float" interfacename="high"/>
+      <input name="in" type="float" nodename="separate_in" output="outw" />
+      <input name="low" type="float" interfacename="low" />
+      <input name="high" type="float" interfacename="high" />
     </smoothstep>
     <combine4 name="combine" type="vector4">
-      <input name="in1" type="float" nodename="smoothstep_x"/>
-      <input name="in2" type="float" nodename="smoothstep_y"/>
-      <input name="in3" type="float" nodename="smoothstep_z"/>
-      <input name="in4" type="float" nodename="smoothstep_w"/>
+      <input name="in1" type="float" nodename="smoothstep_x" />
+      <input name="in2" type="float" nodename="smoothstep_y" />
+      <input name="in3" type="float" nodename="smoothstep_z" />
+      <input name="in4" type="float" nodename="smoothstep_w" />
     </combine4>
-    <output name="out" type="vector4" nodename="combine"/>
+    <output name="out" type="vector4" nodename="combine" />
   </nodegraph>
 
   <!--
@@ -6361,10 +6361,10 @@
   -->
   <nodegraph name="NG_logical_xor" nodedef="ND_logical_xor">
     <not name="not_in1" type="boolean">
-      <input name="in" type="boolean" interfacename="in1"/>
+      <input name="in" type="boolean" interfacename="in1" />
     </not>
     <not name="not_in2" type="boolean">
-      <input name="in" type="boolean" interfacename="in2"/>
+      <input name="in" type="boolean" interfacename="in2" />
     </not>
     <and name="in1_and_not_in2" type="boolean">
       <input name="in1" type="boolean" interfacename="in1" />
@@ -6375,8 +6375,8 @@
       <input name="in2" type="boolean" nodename="not_in1" />
     </and>
     <or name="or" type="boolean">
-      <input name="in1" type="boolean" nodename="in1_and_not_in2"/>
-      <input name="in2" type="boolean" nodename="in2_and_not_in1"/>
+      <input name="in1" type="boolean" nodename="in1_and_not_in2" />
+      <input name="in2" type="boolean" nodename="in2_and_not_in1" />
     </or>
     <output name="out" type="boolean" nodename="or" />
   </nodegraph>
@@ -6386,37 +6386,37 @@
   -->
   <nodegraph name="NG_blur_float" nodedef="ND_blur_float">
     <constant name="const" type="float">
-      <input name="value" type="float" interfacename="in"/>
+      <input name="value" type="float" interfacename="in" />
     </constant>
     <output name="out" type="float" nodename="const" />
   </nodegraph>
   <nodegraph name="NG_blur_color3" nodedef="ND_blur_color3">
     <constant name="const" type="color3">
-      <input name="value" type="color3" interfacename="in"/>
+      <input name="value" type="color3" interfacename="in" />
     </constant>
     <output name="out" type="color3" nodename="const" />
   </nodegraph>
   <nodegraph name="NG_blur_color4" nodedef="ND_blur_color4">
     <constant name="const" type="color4">
-      <input name="value" type="color4" interfacename="in"/>
+      <input name="value" type="color4" interfacename="in" />
     </constant>
     <output name="out" type="color4" nodename="const" />
   </nodegraph>
   <nodegraph name="NG_blur_vector2" nodedef="ND_blur_vector2">
     <constant name="const" type="vector2">
-      <input name="value" type="vector2" interfacename="in"/>
+      <input name="value" type="vector2" interfacename="in" />
     </constant>
     <output name="out" type="vector2" nodename="const" />
   </nodegraph>
   <nodegraph name="NG_blur_vector3" nodedef="ND_blur_vector3">
     <constant name="const" type="vector3">
-      <input name="value" type="vector3" interfacename="in"/>
+      <input name="value" type="vector3" interfacename="in" />
     </constant>
     <output name="out" type="vector3" nodename="const" />
   </nodegraph>
   <nodegraph name="NG_blur_vector4" nodedef="ND_blur_vector4">
     <constant name="const" type="vector4">
-      <input name="value" type="vector4" interfacename="in"/>
+      <input name="value" type="vector4" interfacename="in" />
     </constant>
     <output name="out" type="vector4" nodename="const" />
   </nodegraph>
diff --git a/python/Scripts/mxformat.py b/python/Scripts/mxformat.py
index 0b327883bd..010d32e3a6 100644
--- a/python/Scripts/mxformat.py
+++ b/python/Scripts/mxformat.py
@@ -6,21 +6,31 @@
 
 import argparse
 import os
+import xml.etree.ElementTree as ET
 
 import MaterialX as mx
 
+def is_well_formed(xml_string):
+    error = ''
+    try:
+        ET.fromstring(xml_string)  
+    except ET.ParseError as e:
+        error = str(e)
+
 def main():
     parser = argparse.ArgumentParser(description="Reformat a folder of MaterialX documents in place.")
-    parser.add_argument("--yes", dest="yes", action="store_true", help="Proceed without asking for confirmation from the user.")
-    parser.add_argument('--upgrade', dest='upgrade', action="store_true", help='Upgrade documents to the latest version of the standard.')
+    parser.add_argument('-y', '--yes', dest='yes', action="store_true", help="Proceed without asking for confirmation from the user.")
+    parser.add_argument('-u', '--upgrade', dest='upgrade', action="store_true", help='Upgrade documents to the latest version of the standard.')
+    parser.add_argument('-v', '--validate', dest='validate', action="store_true", help='Perform MaterialX validation on documents after reformatting.')
+    parser.add_argument('-x', '--xml_syntax', dest='xml_syntax', action="store_true", help='Check XML syntax after reformatting.')
     parser.add_argument(dest="inputFolder", help="An input folder to scan for MaterialX documents.")
     opts = parser.parse_args()
 
     validDocs = dict()
     for root, dirs, files in os.walk(opts.inputFolder):
-        for file in files:
-            if file.endswith('.mtlx'):
-                filename = os.path.join(root, file)
+        for filename in files:
+            fullpath = os.path.join(root, filename)
+            if fullpath.endswith('.mtlx'):
                 doc = mx.createDocument()
                 try:
                     readOptions = mx.XmlReadOptions()
@@ -28,11 +38,11 @@ def main():
                     readOptions.readNewlines = True    
                     readOptions.upgradeVersion = opts.upgrade
                     try:
-                        mx.readFromXmlFile(doc, filename, mx.FileSearchPath(), readOptions)
+                        mx.readFromXmlFile(doc, fullpath, mx.FileSearchPath(), readOptions)
                     except Exception as err:
-                        print('Skipping "' + file + '" due to exception: ' + str(err))
+                        print('Skipping "' + filename + '" due to exception: ' + str(err))
                         continue
-                    validDocs[filename] = doc
+                    validDocs[fullpath] = doc
                 except mx.Exception:
                     pass
 
@@ -53,7 +63,22 @@ def main():
         if answer != 'y' and answer != 'Y':
             return
 
+    validate = opts.validate
+    if validate:
+        print(f'- Validate documents')
+    xml_syntax = opts.xml_syntax
+    if xml_syntax:
+        print(f'- Check XML syntax')
     for (filename, doc) in validDocs.items():
+        if xml_syntax:
+            xml_string = mx.writeToXmlString(doc)
+            errors = is_well_formed(xml_string)
+            if errors:
+                print(f'- Warning: Document {filename} is not well-formed XML: {errors}') 
+        if validate:
+            is_valid, errors = doc.validate()
+            if not is_valid:
+                print(f'- Warning: Document {filename} is invalid. Errors {errors}.')
         mx.writeToXmlFile(doc, filename)
 
     if opts.upgrade:
diff --git a/resources/Materials/TestSuite/stdlib/conditional/conditional_logic.mtlx b/resources/Materials/TestSuite/stdlib/conditional/conditional_logic.mtlx
index d931b5bf6e..f9187b1d41 100644
--- a/resources/Materials/TestSuite/stdlib/conditional/conditional_logic.mtlx
+++ b/resources/Materials/TestSuite/stdlib/conditional/conditional_logic.mtlx
@@ -24,7 +24,7 @@
     </xor>
     <output name="out" type="boolean" nodename="xor" />
   </nodegraph>
-  <nodegraph name="and_boolean">
+  <nodegraph name="not_boolean">
     <not name="not" type="boolean">
       <input name="in" type="boolean" value="false" />
     </not>