diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs
index 5a6cb28922..7d2bab2192 100644
--- a/codex-rs/core/src/codex.rs
+++ b/codex-rs/core/src/codex.rs
@@ -1352,23 +1352,21 @@ async fn submission_loop(
                 // that inspect the rollout file do not race with the background writer.
                 let recorder_opt = sess.rollout.lock_unchecked().take();
                 let shutdown_error: Option<String> = match recorder_opt {
-                    Some(recorder) => {
-                        match recorder.shutdown().await {
-                            Ok(()) => {
-                                if delete_rollout && let Err(e) = recorder.delete_rollout_file().await {
-                                    warn!("failed to delete rollout file: {e}");
-                                    Some(format!("Failed to delete rollout file: {e}"))
-                                } else {
-                                    None
-                                }
-                            }
-                            Err(e) => {
-                                warn!("failed to shutdown rollout recorder: {e}");
-                                Some("Failed to shutdown rollout recorder".to_string())
+                    Some(recorder) => match recorder.shutdown().await {
+                        Ok(()) => {
+                            if delete_rollout && let Err(e) = recorder.delete_rollout_file().await {
+                                warn!("failed to delete rollout file: {e}");
+                                Some(format!("Failed to delete rollout file: {e}"))
+                            } else {
+                                None
                             }
                         }
-                    }
-                    None => None
+                        Err(e) => {
+                            warn!("failed to shutdown rollout recorder: {e}");
+                            Some("Failed to shutdown rollout recorder".to_string())
+                        }
+                    },
+                    None => None,
                 };
 
                 if let Some(message) = shutdown_error {
diff --git a/codex-rs/mcp-server/src/codex_message_processor.rs b/codex-rs/mcp-server/src/codex_message_processor.rs
index caf5a7ea10..1ed371dd68 100644
--- a/codex-rs/mcp-server/src/codex_message_processor.rs
+++ b/codex-rs/mcp-server/src/codex_message_processor.rs
@@ -729,9 +729,7 @@ impl CodexMessageProcessor {
         {
             let error = JSONRPCErrorError {
                 code: INTERNAL_ERROR_CODE,
-                message: format!(
-                    "error shutting down conversation {conversation_id}: {err}"
-                ),
+                message: format!("error shutting down conversation {conversation_id}: {err}"),
                 data: None,
             };
             self.outgoing.send_error(request_id, error).await;
@@ -749,7 +747,6 @@ impl CodexMessageProcessor {
         self.outgoing
             .send_response(request_id, DeleteConversationResponse {})
             .await;
-
     }
 
     async fn send_user_message(&self, request_id: RequestId, params: SendUserMessageParams) {