diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactClientFailureReport.h b/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactClientFailureReport.h
index 19e98a7d1f..0a482e8c51 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactClientFailureReport.h
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactClientFailureReport.h
@@ -113,7 +113,7 @@ namespace TestImpact
             //! Returns the test targets that contain failing tests.
             const AZStd::vector<TestRunFailure>& GetTestRunFailures() const;
 
-            //! Returns the test targets in this sequence that were terminated for exceeding their allotted flight time.
+            //! Returns the test targets in this sequence that were terminated for exceeding their allotted runtime.
             const AZStd::vector<TargetFailure>& GetTimedOutTests() const;
 
             //! Returns the test targets in this sequence that were not executed due to the sequence terminating prematurely.
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactClientTestSelection.h b/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactClientTestSelection.h
index 76e6461206..7720bbc5ad 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactClientTestSelection.h
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactClientTestSelection.h
@@ -40,7 +40,7 @@ namespace TestImpact
             //! Returns the number of selected test runs that will not be run.
             size_t GetNumExcludedTestRuns() const;
 
-            //! Returns the total number of tests runs selected regardless of whether or not they will actually be run.
+            //! Returns the total number of test runs selected regardless of whether or not they will actually be run.
             size_t GetTotalNumTests() const;
 
         private:
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactRepoPath.h b/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactRepoPath.h
index 80f82e4785..9ac457e428 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactRepoPath.h
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactRepoPath.h
@@ -30,7 +30,7 @@ namespace TestImpact
         constexpr RepoPath() = default;
         constexpr RepoPath(const RepoPath&) = default;
         constexpr RepoPath(RepoPath&&) noexcept = default;
-        constexpr RepoPath::RepoPath(const string_type & path) noexcept;
+        constexpr RepoPath::RepoPath(const string_type& path) noexcept;
         constexpr RepoPath::RepoPath(const string_view_type& path) noexcept;
         constexpr RepoPath::RepoPath(const value_type* path) noexcept;
         constexpr RepoPath::RepoPath(const AZ::IO::PathView& path);
@@ -53,11 +53,11 @@ namespace TestImpact
         constexpr AZ::IO::PathView RootName() const { return m_path.RootName(); }
         constexpr AZ::IO::PathView RelativePath() const { return m_path.RelativePath(); }
 
+        // Wrappers around the AZ::IO::Path concatenation operator
         friend RepoPath operator/(const RepoPath& lhs, const AZ::IO::PathView& rhs);
         friend RepoPath operator/(const RepoPath& lhs, AZStd::string_view rhs);
         friend RepoPath operator/(const RepoPath& lhs, const typename value_type* rhs);
         friend RepoPath operator/(const RepoPath& lhs, const RepoPath& rhs);
-
         RepoPath& operator/=(const AZ::IO::PathView& rhs);
         RepoPath& operator/=(AZStd::string_view rhs);
         RepoPath& operator/=(const typename value_type* rhs);
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactRuntime.h b/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactRuntime.h
index 31b2d1edce..266bd5ef7a 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactRuntime.h
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Include/TestImpactFramework/TestImpactRuntime.h
@@ -83,7 +83,7 @@ namespace TestImpact
         AZStd::chrono::milliseconds duration)>;
 
     //! Callback for test runs that have completed for any reason.
-    //! selectedTests The test that has completed.
+    //! @param selectedTests The test that has completed.
     using TestRunCompleteCallback = AZStd::function<void(Client::TestRun&& selectedTests)>;
 
     //! The API exposed to the client responsible for all test runs and persistent data management.
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactDynamicDependencyMap.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactDynamicDependencyMap.cpp
index 919c10d049..826fa0a87d 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactDynamicDependencyMap.cpp
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactDynamicDependencyMap.cpp
@@ -174,8 +174,8 @@ namespace TestImpact
 
                     // Build target to covering test target mapping
                     for (const auto& parentTarget : sourceDependency.m_parentTargets)
-                    {                        
-                        m_buildTargetCoverage[parentTarget.GetBuildTarget()].insert(testTarget);                        
+                    {
+                        m_buildTargetCoverage[parentTarget.GetBuildTarget()].insert(testTarget);
                     }
                 }
                 else
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactSourceCoveringTestsSerializer.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactSourceCoveringTestsSerializer.cpp
index 7b89f3bda9..5143f9b73c 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactSourceCoveringTestsSerializer.cpp
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactSourceCoveringTestsSerializer.cpp
@@ -20,7 +20,7 @@
 
 namespace TestImpact
 {
-    // Tag used to indicate that a given line is the name o a covering test target
+    // Tag used to indicate whether a given line is the name or a covering test target
     constexpr char TargetTag = '-';
 
     AZStd::string SerializeSourceCoveringTestsList(const SourceCoveringTestsList& sourceCoveringTestsList)
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Platform/Windows/TestEngine/TestImpactWin32_TestEngineJobFailure.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Platform/Windows/TestEngine/TestImpactWin32_TestEngineJobFailure.cpp
index 578130882d..6561293d5a 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Platform/Windows/TestEngine/TestImpactWin32_TestEngineJobFailure.cpp
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Platform/Windows/TestEngine/TestImpactWin32_TestEngineJobFailure.cpp
@@ -32,4 +32,4 @@ namespace TestImpact
 
         return AZStd::nullopt;
     }
-}
+} // namespace TestImpact
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/TestImpactTestEngineJobFailure.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/TestImpactTestEngineJobFailure.cpp
index debf1406f2..931e3a272b 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/TestImpactTestEngineJobFailure.cpp
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/TestImpactTestEngineJobFailure.cpp
@@ -79,4 +79,4 @@ namespace TestImpact
 
         return AZStd::nullopt;
     }
-}
+} // namespace TestImpact
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/TestImpactTestEngineJobFailure.h b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/TestImpactTestEngineJobFailure.h
index 799e8fc718..969aad9c84 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/TestImpactTestEngineJobFailure.h
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/TestImpactTestEngineJobFailure.h
@@ -31,4 +31,4 @@ namespace TestImpact
 
     //! Checks for all known error return codes and returns the corresponding client test run result or empty.
     AZStd::optional<Client::TestRunResult> CheckForAnyKnownErrorCode(ReturnCode returnCode);
-}
+} // namespace TestImpact