diff --git a/crates/ahm/src/heal/manager.rs b/crates/ahm/src/heal/manager.rs
index cb241883..044289e1 100644
--- a/crates/ahm/src/heal/manager.rs
+++ b/crates/ahm/src/heal/manager.rs
@@ -18,8 +18,8 @@ use crate::heal::{
     storage::HealStorageAPI,
     task::{HealOptions, HealPriority, HealRequest, HealTask, HealTaskStatus, HealType},
 };
-use rustfs_ecstore::disk::error::DiskError;
 use rustfs_ecstore::disk::DiskAPI;
+use rustfs_ecstore::disk::error::DiskError;
 use rustfs_ecstore::global::GLOBAL_LOCAL_DISK_MAP;
 use std::{
     collections::{HashMap, VecDeque},
diff --git a/crates/ahm/src/heal/resume.rs b/crates/ahm/src/heal/resume.rs
index 260a2243..cf9d5cae 100644
--- a/crates/ahm/src/heal/resume.rs
+++ b/crates/ahm/src/heal/resume.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use crate::error::{Error, Result};
-use rustfs_ecstore::disk::{DiskAPI, DiskStore, BUCKET_META_PREFIX, RUSTFS_META_BUCKET};
+use rustfs_ecstore::disk::{BUCKET_META_PREFIX, DiskAPI, DiskStore, RUSTFS_META_BUCKET};
 use serde::{Deserialize, Serialize};
 use std::path::Path;
 use std::sync::Arc;
@@ -618,7 +618,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_get_resumable_tasks_integration() {
-        use rustfs_ecstore::disk::{endpoint::Endpoint, new_disk, DiskOption};
+        use rustfs_ecstore::disk::{DiskOption, endpoint::Endpoint, new_disk};
         use tempfile::TempDir;
 
         // Create a temporary directory for testing
diff --git a/crates/ahm/src/heal/storage.rs b/crates/ahm/src/heal/storage.rs
index dcdf9781..43ca4163 100644
--- a/crates/ahm/src/heal/storage.rs
+++ b/crates/ahm/src/heal/storage.rs
@@ -16,7 +16,7 @@ use crate::error::{Error, Result};
 use async_trait::async_trait;
 use rustfs_common::heal_channel::{HealOpts, HealScanMode};
 use rustfs_ecstore::{
-    disk::{endpoint::Endpoint, DiskStore},
+    disk::{DiskStore, endpoint::Endpoint},
     store::ECStore,
     store_api::{BucketInfo, ObjectIO, StorageAPI},
 };
diff --git a/crates/ahm/src/lib.rs b/crates/ahm/src/lib.rs
index 7bc1b689..17a70ff4 100644
--- a/crates/ahm/src/lib.rs
+++ b/crates/ahm/src/lib.rs
@@ -21,7 +21,7 @@ pub mod heal;
 pub mod scanner;
 
 pub use error::{Error, Result};
-pub use heal::{channel::HealChannelProcessor, HealManager, HealOptions, HealPriority, HealRequest, HealType};
+pub use heal::{HealManager, HealOptions, HealPriority, HealRequest, HealType, channel::HealChannelProcessor};
 pub use scanner::Scanner;
 
 // Global cancellation token for AHM services (scanner and other background tasks)
diff --git a/crates/ahm/src/scanner/data_scanner.rs b/crates/ahm/src/scanner/data_scanner.rs
index 5a28186a..8083ecf7 100644
--- a/crates/ahm/src/scanner/data_scanner.rs
+++ b/crates/ahm/src/scanner/data_scanner.rs
@@ -22,7 +22,7 @@ use ecstore::{
     disk::{DiskAPI, DiskStore, WalkDirOptions},
     set_disk::SetDisks,
 };
-use rustfs_ecstore::{self as ecstore, data_usage::store_data_usage_in_backend, StorageAPI};
+use rustfs_ecstore::{self as ecstore, StorageAPI, data_usage::store_data_usage_in_backend};
 use rustfs_filemeta::MetacacheReader;
 use tokio::sync::{Mutex, RwLock};
 use tokio_util::sync::CancellationToken;
@@ -31,12 +31,13 @@ use tracing::{debug, error, info, warn};
 use super::metrics::{BucketMetrics, DiskMetrics, MetricsCollector, ScannerMetrics};
 use crate::heal::HealManager;
 use crate::{
+    HealRequest,
     error::{Error, Result},
-    get_ahm_services_cancel_token, HealRequest,
+    get_ahm_services_cancel_token,
 };
 use rustfs_common::{
     data_usage::DataUsageInfo,
-    metrics::{globalMetrics, Metric, Metrics},
+    metrics::{Metric, Metrics, globalMetrics},
 };
 
 use rustfs_ecstore::disk::RUSTFS_META_BUCKET;
@@ -1393,8 +1394,8 @@ mod tests {
     use rustfs_ecstore::endpoints::{EndpointServerPools, Endpoints, PoolEndpoints};
     use rustfs_ecstore::store::ECStore;
     use rustfs_ecstore::{
-        store_api::{MakeBucketOptions, ObjectIO, PutObjReader},
         StorageAPI,
+        store_api::{MakeBucketOptions, ObjectIO, PutObjReader},
     };
     use serial_test::serial;
     use std::fs;