diff --git a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsRequestMiddleware.swift b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsRequestMiddleware.swift
index 65bde1f9c96..96dba77cbc0 100644
--- a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsRequestMiddleware.swift
+++ b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsRequestMiddleware.swift
@@ -68,7 +68,8 @@ public struct FlexibleChecksumsRequestMiddleware<OperationStackInput, OperationS
         }
 
         var checksumHashFunction: ChecksumAlgorithm
-        if let checksumAlgorithm { // If checksum algorithm to use was configured via checksum algorithm input member by the user
+        if let checksumAlgorithm {
+            // If checksum algorithm to use was configured via checksum algorithm input member by the user
             if let hashFunction = ChecksumAlgorithm.from(string: checksumAlgorithm) {
                 // If user chose a supported algorithm, continue
                 checksumHashFunction = hashFunction
@@ -117,10 +118,12 @@ public struct FlexibleChecksumsRequestMiddleware<OperationStackInput, OperationS
                 // If not eligible for chunked streaming, calculate and add checksum to request header now instead of as a trailing header.
                 let streamBytes: Data?
                 if stream.isSeekable {
-                    let currentPosition = stream.position // Need to save current position to reset stream position after reading
+                    // Need to save current position to reset stream position after reading
+                    let currentPosition = stream.position
                     try stream.seek(toOffset: 0) // Explicit seek to beginning for correct behavior of FileHandle
                     streamBytes = try stream.readToEnd()
-                    try stream.seek(toOffset: currentPosition) // Reset stream position to where it was before reading it for checksum calculation
+                    // Reset stream position to where it was before reading it for checksum calculation
+                    try stream.seek(toOffset: currentPosition)
                 } else {
                     streamBytes = try await stream.readToEndAsync()
                     builder.withBody(.data(streamBytes)) // Reset request body with streamBytes to "refill" it
@@ -128,7 +131,8 @@ public struct FlexibleChecksumsRequestMiddleware<OperationStackInput, OperationS
                 try await calculateAndAddChecksumHeader(data: streamBytes)
             }
         case .noStream:
-            break // Unreachable block, but it's here for exhaustive switch case
+            // Unreachable block since we return early if .noStream, but it's here for exhaustive switch case
+            break
         }
 
         func calculateAndAddChecksumHeader(data: Data?) async throws {
diff --git a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsResponseMiddleware.swift b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsResponseMiddleware.swift
index 3963a74874c..cf61e79850a 100644
--- a/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsResponseMiddleware.swift
+++ b/Sources/Core/AWSClientRuntime/Sources/AWSClientRuntime/Middlewares/FlexibleChecksumsResponseMiddleware.swift
@@ -41,11 +41,11 @@ public struct FlexibleChecksumsResponseMiddleware<OperationStackInput, Operation
 
         let checksumHeaderIsPresent = priorityList.first {
             response.headers.value(for: "x-amz-checksum-\($0)") != nil  &&
-            // When retrieving an object uploaded usingn mutipart upload (MPU) and flexible checksum,
+            // When retrieving an object uploaded using mutipart upload (MPU) and flexible checksum,
             //   S3 may return the checksum for the whole object (full object checksum)
             //   or the checksum of checksums (composite checksum).
             // Composite checksums end in "-#" where # is an integer between 1 and 10000, indicating number of parts the object
-            //   was original uploaded in.
+            //   was originally uploaded in.
             // The composite checksum should be ignored.
             !isCompositeChecksum(response.headers.value(for: "x-amz-checksum-\($0)")!)
         }
diff --git a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/flexiblechecksums/FlexibleChecksumsRequestIntegration.kt b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/flexiblechecksums/FlexibleChecksumsRequestIntegration.kt
index 1c62fdb9843..3f010619ebb 100644
--- a/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/flexiblechecksums/FlexibleChecksumsRequestIntegration.kt
+++ b/codegen/smithy-aws-swift-codegen/src/main/kotlin/software/amazon/smithy/aws/swift/codegen/customization/flexiblechecksums/FlexibleChecksumsRequestIntegration.kt
@@ -43,7 +43,7 @@ class FlexibleChecksumsRequestIntegration : SwiftIntegration {
          */
         val useFlexibleChecksum = httpChecksumTrait != null && (
             (
-                (httpChecksumTrait.requestAlgorithmMember?.orElse(null) != null) &&
+                (httpChecksumTrait.requestAlgorithmMember?.isPresent ?: false) &&
                     (input?.memberNames?.any { it == httpChecksumTrait.requestAlgorithmMember.get() } == true)
                 ) || (httpChecksumTrait.isRequestChecksumRequired)
             )