diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactClientFailureReport.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactClientFailureReport.cpp
index f39d8ee426..d8e4709f21 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactClientFailureReport.cpp
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactClientFailureReport.cpp
@@ -119,6 +119,6 @@ namespace TestImpact
         const AZStd::vector<TargetFailure>& SequenceFailure::GetUnexecutedTests() const
         {
             return m_unexecutedTests;
-        }        
-    }
-}
+        }
+    } // namespace Client
+} // namespace TestImpact
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactClientTestRun.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactClientTestRun.cpp
index 6661de5d69..dfc9f9d46c 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactClientTestRun.cpp
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactClientTestRun.cpp
@@ -36,5 +36,5 @@ namespace TestImpact
         {
             return m_result;
         }
-    }
-}
+    } // namespace Client
+} // namespace TestImpact
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactClientTestSelection.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactClientTestSelection.cpp
index f6c88893d7..067ab53fd5 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactClientTestSelection.cpp
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactClientTestSelection.cpp
@@ -52,5 +52,5 @@ namespace TestImpact
         {
             return GetNumIncludedTestRuns() + GetNumExcludedTestRuns();
         }
-    }
-}
+    } // namespace Client
+} // namespace TestImpact
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactRuntime.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactRuntime.cpp
index 538d435d16..9c9351244f 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactRuntime.cpp
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactRuntime.cpp
@@ -27,7 +27,7 @@ namespace TestImpact
 {
     namespace
     {
-        // Simple helper class for tracking basic timing information
+        //! Simple helper class for tracking basic timing information.
         class Timer
         {
         public:
@@ -36,7 +36,7 @@ namespace TestImpact
             {
             }
 
-            // Returns the time elapsed (in milliseconds) since the timer was instantiated
+            //! Returns the time elapsed (in milliseconds) since the timer was instantiated
             AZStd::chrono::milliseconds Elapsed()
             {
                 const auto endTime = AZStd::chrono::high_resolution_clock::now();
@@ -47,7 +47,7 @@ namespace TestImpact
             AZStd::chrono::high_resolution_clock::time_point m_startTime;
         };
 
-        // Handler for test run complete events
+        //! Handler for test run complete events.
         class TestRunCompleteCallbackHandler
         {
         public:
@@ -145,9 +145,9 @@ namespace TestImpact
     void Runtime::EnumerateMutatedTestTargets(const ChangeDependencyList& changeDependencyList)
     {
         AZStd::vector<const TestTarget*> testTargets;
-        const auto addMutatedTestTargetsToEnumerationList = [this, &testTargets](const AZStd::vector<SourceDependency>& sourceDependency)
+        const auto addMutatedTestTargetsToEnumerationList = [this, &testTargets](const AZStd::vector<SourceDependency>& sourceDependencies)
         {
-            for (const auto& sourceDependency : sourceDependency)
+            for (const auto& sourceDependency : sourceDependencies)
             {
                 for (const auto& parentTarget : sourceDependency.GetParentTargets())
                 {
@@ -184,14 +184,14 @@ namespace TestImpact
         AZStd::vector<const TestTarget*> discardedTestTargets;
 
         // Select and prioritize the test targets pertinent to this change list
-        const auto changeDependecyList = m_dynamicDependencyMap->ApplyAndResoveChangeList(changeList);
-        const auto selectedTestTargets = m_testSelectorAndPrioritizer->SelectTestTargets(changeDependecyList, testPrioritizationPolicy);
+        const auto changeDependencyList = m_dynamicDependencyMap->ApplyAndResoveChangeList(changeList);
+        const auto selectedTestTargets = m_testSelectorAndPrioritizer->SelectTestTargets(changeDependencyList, testPrioritizationPolicy);
 
         // Populate a set with the selected test targets so that we can infer the discarded test target not selected for this change list
         const AZStd::unordered_set<const TestTarget*> selectedTestTargetSet(selectedTestTargets.begin(), selectedTestTargets.end());
 
         // Update the enumeration caches of mutated targets regardless of the current sharding policy
-        EnumerateMutatedTestTargets(changeDependecyList);
+        EnumerateMutatedTestTargets(changeDependencyList);
 
         // The test targets in the main list not in the selected test target set are the test targets not selected for this change list
         for (const auto& testTarget : m_dynamicDependencyMap->GetTestTargetList().GetTargets())
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactRuntimeUtils.h b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactRuntimeUtils.h
index 3210ba808b..e9d1c5425b 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactRuntimeUtils.h
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestImpactRuntimeUtils.h
@@ -59,7 +59,7 @@ namespace TestImpact
                 AZStd::vector<Client::TestFailure> testFailures;
                 for (const auto& testCase : testSuite.m_tests)
                 {
-                    if(testCase.m_result.value_or(TestRunResult::Passed) == TestRunResult::Failed)
+                    if (testCase.m_result.value_or(TestRunResult::Passed) == TestRunResult::Failed)
                     {
                         testFailures.push_back(Client::TestFailure(testCase.m_name, "No error message retrieved"));
                     }