diff --git a/src/bin/tui.rs b/src/bin/tui.rs
index 52138fb..eb8e86b 100644
--- a/src/bin/tui.rs
+++ b/src/bin/tui.rs
@@ -315,7 +315,10 @@ impl App {
                 if all_mode {
                     match self.engine.stats_all() {
                         Ok(s) => {
-                            self.log_push("\u{2500}\u{2500}\u{2500} Detailed Statistics \u{2500}\u{2500}\u{2500}".to_string(), C_ORANGE);
+                            self.log_push(
+                                "\u{2500}\u{2500}\u{2500} Detailed Statistics \u{2500}\u{2500}\u{2500}".to_string(),
+                                C_ORANGE,
+                            );
                             self.log_push(
                                 format!("  MemTable records : {}", s.mem_records),
                                 C_TEXT,
@@ -565,10 +568,10 @@ fn main() -> io::Result<()> {
         if event::poll(tick)? {
             match event::read()? {
                 Event::Key(k) => {
-                    if (matches!(k.code, KeyCode::Char('c'))
+                    let quit = (matches!(k.code, KeyCode::Char('c'))
                         && k.modifiers.contains(KeyModifiers::CONTROL))
-                        || matches!(k.code, KeyCode::Esc)
-                    {
+                        || matches!(k.code, KeyCode::Esc);
+                    if quit {
                         app.should_quit = true;
                     } else if app.focus == Focus::Input {
                         match k.code {
diff --git a/src/features/mod.rs b/src/features/mod.rs
index a1a4418..3052eba 100644
--- a/src/features/mod.rs
+++ b/src/features/mod.rs
@@ -54,15 +54,15 @@ impl FeatureClient {
             Some(v) => v,
             None => {
                 let features = Features::default();
-                let json = serde_json::to_vec(&features)
-                    .map_err(|e| LsmError::SerializationFailed(e.to_string()))?;
+                // serde_json::Error converts automatically via JsonError(#[from])
+                let json = serde_json::to_vec(&features)?;
                 self.engine.set(Self::KEY.to_string(), json)?;
                 return Ok(features);
             }
         };
 
-        let features: Features = serde_json::from_slice(&bytes_vec)
-            .map_err(|e| LsmError::DeserializationFailed(e.to_string()))?;
+        // serde_json::Error converts automatically via JsonError(#[from])
+        let features: Features = serde_json::from_slice(&bytes_vec)?;
 
         let mut cache = self.cache.write().unwrap();
         *cache = Some((features.clone(), Instant::now()));
@@ -113,8 +113,8 @@ impl FeatureClient {
 
             features.version += 1;
 
-            let json = serde_json::to_vec(&features)
-                .map_err(|e| LsmError::SerializationFailed(e.to_string()))?;
+            // serde_json::Error converts automatically via JsonError(#[from])
+            let json = serde_json::to_vec(&features)?;
 
             match self.engine.set(Self::KEY.to_string(), json) {
                 Ok(_) => {
@@ -138,8 +138,8 @@ impl FeatureClient {
 
         if removed {
             features.version += 1;
-            let json = serde_json::to_vec(&features)
-                .map_err(|e| LsmError::SerializationFailed(e.to_string()))?;
+            // serde_json::Error converts automatically via JsonError(#[from])
+            let json = serde_json::to_vec(&features)?;
             self.engine.set(Self::KEY.to_string(), json)?;
             self.invalidate_cache();
         }
diff --git a/src/infra/error.rs b/src/infra/error.rs
index 98bd98a..f123d78 100644
--- a/src/infra/error.rs
+++ b/src/infra/error.rs
@@ -3,26 +3,54 @@ use std::io;
 use std::time::SystemTimeError;
 use thiserror::Error;
 
+/// Unified error type for the ApexStore LSM engine.
+///
+/// # Design
+///
+/// Variants are grouped by origin:
+///
+/// - **Infrastructure** (`Io`, `Codec`, `JsonError`, `Time`) — low-level OS / serde
+///   errors converted automatically via `#[from]`.
+/// - **Storage format** (`InvalidSstableFormat`, `CorruptedData`,
+///   `DecompressionFailed`, `WalCorruption`) — structural problems in on-disk files.
+/// - **Engine semantics** (`KeyNotFound`, `CompactionFailed`, `LockPoisoned`,
+///   `ConcurrentModification`) — logical errors arising from engine operations.
+/// - **Configuration** (`Invalid*`, `ConfigValidation`) — parameter
+///   validation failures raised at startup.
+///
+/// # Variant history
+///
+/// | Removed variant       | Reason |
+/// |-----------------------|--------|
+/// | `NotFound`            | Exact duplicate of `KeyNotFound` — same Display text, zero call sites |
+/// | `InvalidSstable`      | Context-free alias for `InvalidSstableFormat(String)` — zero call sites |
+/// | `SerializationFailed(String)` | Replaced by `JsonError(#[from] serde_json::Error)` |
+/// | `DeserializationFailed(String)` | Replaced by `JsonError(#[from] serde_json::Error)` |
+///
+/// `Serialization(#[from] bincode::Error)` was renamed to `Codec` to match
+/// the `infra::codec` module name.
 #[derive(Error, Debug)]
 pub enum LsmError {
+    // -------------------------------------------------------------------------
+    // Infrastructure — converted automatically via #[from]
+    // -------------------------------------------------------------------------
     #[error("I/O error: {0}")]
     Io(#[from] io::Error),
 
-    #[error("Serialization error: {0}")]
-    Serialization(#[from] bincode::Error),
+    /// Bincode encode/decode failures from `infra::codec`.
+    #[error("Codec error: {0}")]
+    Codec(#[from] bincode::Error),
+
+    /// JSON encode/decode failures (serde_json), e.g. from `features::FeatureClient`.
+    #[error("JSON error: {0}")]
+    JsonError(#[from] serde_json::Error),
 
     #[error("System time error: {0}")]
     Time(#[from] SystemTimeError),
 
-    #[error("Lock poisoned: {0}")]
-    LockPoisoned(&'static str),
-
-    #[error("Key not found")]
-    KeyNotFound,
-
-    #[error("Invalid SSTable format")]
-    InvalidSstable,
-
+    // -------------------------------------------------------------------------
+    // Storage format
+    // -------------------------------------------------------------------------
     #[error("Invalid SSTable format: {0}")]
     InvalidSstableFormat(String),
 
@@ -32,25 +60,31 @@ pub enum LsmError {
     #[error("Decompression failed: {0}")]
     DecompressionFailed(String),
 
-    #[error("Compaction failed: {0}")]
-    CompactionFailed(String),
-
     #[error("WAL corruption detected")]
     WalCorruption,
 
-    #[error("Serialization failed: {0}")]
-    SerializationFailed(String),
+    // -------------------------------------------------------------------------
+    // Engine semantics
+    // -------------------------------------------------------------------------
+    #[error("Key not found")]
+    KeyNotFound,
+
+    #[error("Compaction failed: {0}")]
+    CompactionFailed(String),
 
-    #[error("Deserialization failed: {0}")]
-    DeserializationFailed(String),
+    /// Raised when a `std::sync::Mutex` is poisoned (i.e. a thread panicked
+    /// while holding the lock). Not applicable to `parking_lot` mutexes.
+    #[error("Lock poisoned: {0}")]
+    LockPoisoned(&'static str),
 
-    #[error("Concurrent modification detected")]
+    /// Raised in optimistic-concurrency retry loops when all attempts are
+    /// exhausted (e.g. `FeatureClient::set_flag`).
+    #[error("Concurrent modification conflict")]
     ConcurrentModification,
 
-    #[error("Key not found")]
-    NotFound,
-
-    // Configuration validation errors
+    // -------------------------------------------------------------------------
+    // Configuration validation
+    // -------------------------------------------------------------------------
     #[error("Invalid block size: {0}")]
     InvalidBlockSize(String),