diff --git a/source/val/validate_decorations.cpp b/source/val/validate_decorations.cpp
index 03d9a324a9..e0fc098820 100644
--- a/source/val/validate_decorations.cpp
+++ b/source/val/validate_decorations.cpp
@@ -1450,7 +1450,6 @@ spv_result_t CheckDecorationsOfBuffers(ValidationState_t& vstate) {
                      : (sc == spv::StorageClass::Workgroup ? "Workgroup"
                                                            : "StorageBuffer"));
 
-      //const auto data_type_id = inst.GetOperandAs<uint32_t>(2);
       const auto data_type = vstate.FindDef(data_type_id);
       scalar_block_layout =
           sc == spv::StorageClass::Workgroup
diff --git a/source/val/validate_interfaces.cpp b/source/val/validate_interfaces.cpp
index 817ce35a23..8b96dc8248 100644
--- a/source/val/validate_interfaces.cpp
+++ b/source/val/validate_interfaces.cpp
@@ -529,7 +529,8 @@ spv_result_t ValidateLocations(ValidationState_t& _,
     auto interface_id = entry_point->GetOperandAs<uint32_t>(i);
     auto interface_var = _.FindDef(interface_id);
     const auto sc_index = 2u;
-    auto storage_class = interface_var->GetOperandAs<spv::StorageClass>(sc_index);
+    auto storage_class =
+        interface_var->GetOperandAs<spv::StorageClass>(sc_index);
     if (storage_class != spv::StorageClass::Input &&
         storage_class != spv::StorageClass::Output) {
       continue;
diff --git a/source/val/validate_memory.cpp b/source/val/validate_memory.cpp
index 75dcd3c286..beaa79c28e 100644
--- a/source/val/validate_memory.cpp
+++ b/source/val/validate_memory.cpp
@@ -829,7 +829,8 @@ spv_result_t ValidateVariable(ValidationState_t& _, const Instruction* inst) {
         (!_.HasCapability(spv::Capability::Float16) &&
          _.ContainsSizedIntOrFloatType(value_id, spv::Op::OpTypeFloat, 16))) {
       auto underlying_type = value_type;
-      while (underlying_type && underlying_type->opcode() == spv::Op::OpTypePointer) {
+      while (underlying_type &&
+             underlying_type->opcode() == spv::Op::OpTypePointer) {
         storage_class = underlying_type->GetOperandAs<spv::StorageClass>(1u);
         underlying_type =
             _.FindDef(underlying_type->GetOperandAs<uint32_t>(2u));
@@ -894,7 +895,8 @@ spv_result_t ValidateVariable(ValidationState_t& _, const Instruction* inst) {
     if (!_.HasCapability(spv::Capability::Int8) &&
         _.ContainsSizedIntOrFloatType(value_id, spv::Op::OpTypeInt, 8)) {
       auto underlying_type = value_type;
-      while (underlying_type && underlying_type->opcode() == spv::Op::OpTypePointer) {
+      while (underlying_type &&
+             underlying_type->opcode() == spv::Op::OpTypePointer) {
         storage_class = underlying_type->GetOperandAs<spv::StorageClass>(1u);
         underlying_type =
             _.FindDef(underlying_type->GetOperandAs<uint32_t>(2u));
diff --git a/test/val/val_decoration_test.cpp b/test/val/val_decoration_test.cpp
index 99694df1fb..19cb12bbfb 100644
--- a/test/val/val_decoration_test.cpp
+++ b/test/val/val_decoration_test.cpp
@@ -10210,7 +10210,8 @@ INSTANTIATE_TEST_SUITE_P(ValidateUntypedVariableSetAndBinding,
                          UntypedVariableSetAndBinding,
                          Values("StorageBuffer", "Uniform"));
 
-using UntypedPointerLayout = spvtest::ValidateBase<std::tuple<std::string, std::string>>;
+using UntypedPointerLayout =
+    spvtest::ValidateBase<std::tuple<std::string, std::string>>;
 
 TEST_P(UntypedPointerLayout, BadOffset) {
   const auto sc = std::get<0>(GetParam());