diff --git a/src/ping_clients/ping_client_factory.rs b/src/ping_clients/ping_client_factory.rs
index d887843..249c71a 100644
--- a/src/ping_clients/ping_client_factory.rs
+++ b/src/ping_clients/ping_client_factory.rs
@@ -1,5 +1,5 @@
 use crate::ping_clients::ping_client_tcp::PingClientTcp;
-use crate::{ExternalPingClientFactory, PingClient, PingClientConfig, RnpSupportedProtocol};
+use crate::*;
 
 #[cfg(any(not(target_os = "windows"), not(target_arch = "aarch64")))]
 use crate::ping_clients::ping_client_quic::PingClientQuic;
diff --git a/src/ping_clients/ping_client_quic.rs b/src/ping_clients/ping_client_quic.rs
index 5827878..79e7f51 100644
--- a/src/ping_clients/ping_client_quic.rs
+++ b/src/ping_clients/ping_client_quic.rs
@@ -1,7 +1,4 @@
-use crate::ping_clients::ping_client::{
-    PingClient, PingClientError, PingClientPingResultDetails, PingClientResult, PingClientWarning,
-};
-use crate::PingClientConfig;
+use crate::*;
 use async_trait::async_trait;
 use quinn::{ClientConfigBuilder, ConnectionError, Endpoint, EndpointError};
 use rustls::ServerCertVerified;
diff --git a/src/ping_clients/ping_client_tcp.rs b/src/ping_clients/ping_client_tcp.rs
index 1085915..a0fad83 100644
--- a/src/ping_clients/ping_client_tcp.rs
+++ b/src/ping_clients/ping_client_tcp.rs
@@ -1,7 +1,4 @@
-use crate::ping_clients::ping_client::{
-    PingClient, PingClientError, PingClientPingResultDetails, PingClientResult, PingClientWarning,
-};
-use crate::PingClientConfig;
+use crate::*;
 use async_trait::async_trait;
 use socket2::{Domain, SockAddr, Socket, Type};
 use std::io;
diff --git a/src/ping_clients/ping_client_test_common.rs b/src/ping_clients/ping_client_test_common.rs
index ccb25d2..a176177 100644
--- a/src/ping_clients/ping_client_test_common.rs
+++ b/src/ping_clients/ping_client_test_common.rs
@@ -1,4 +1,4 @@
-use crate::ping_clients::ping_client::PingClient;
+use crate::*;
 use pretty_assertions::assert_eq;
 use std::net::SocketAddr;
 use std::time::Duration;
diff --git a/src/ping_result_processors/ping_result_processor_console_logger.rs b/src/ping_result_processors/ping_result_processor_console_logger.rs
index da9b17c..4523710 100644
--- a/src/ping_result_processors/ping_result_processor_console_logger.rs
+++ b/src/ping_result_processors/ping_result_processor_console_logger.rs
@@ -1,6 +1,4 @@
-use crate::ping_clients::ping_client::PingClientWarning;
-use crate::ping_result_processors::ping_result_processor::PingResultProcessor;
-use crate::PingResult;
+use crate::*;
 use std::io::{stdout, Write};
 use std::net::SocketAddr;
 use std::time::Instant;
diff --git a/src/ping_result_processors/ping_result_processor_csv_logger.rs b/src/ping_result_processors/ping_result_processor_csv_logger.rs
index b686221..5efe3e7 100644
--- a/src/ping_result_processors/ping_result_processor_csv_logger.rs
+++ b/src/ping_result_processors/ping_result_processor_csv_logger.rs
@@ -1,5 +1,4 @@
-use crate::ping_result_processors::ping_result_processor::PingResultProcessor;
-use crate::{rnp_utils, PingResult};
+use crate::*;
 use std::{fs::File, io, io::prelude::*, path::PathBuf};
 use tracing;
 
diff --git a/src/ping_result_processors/ping_result_processor_json_logger.rs b/src/ping_result_processors/ping_result_processor_json_logger.rs
index 4f2d5f8..b4e3d41 100644
--- a/src/ping_result_processors/ping_result_processor_json_logger.rs
+++ b/src/ping_result_processors/ping_result_processor_json_logger.rs
@@ -1,5 +1,4 @@
-use crate::ping_result_processors::ping_result_processor::PingResultProcessor;
-use crate::{rnp_utils, PingResult};
+use crate::*;
 use std::{fs::File, io, io::prelude::*, path::PathBuf};
 use tracing;
 
diff --git a/src/ping_result_processors/ping_result_processor_latency_bucket_logger.rs b/src/ping_result_processors/ping_result_processor_latency_bucket_logger.rs
index 83b4a06..88e4c63 100644
--- a/src/ping_result_processors/ping_result_processor_latency_bucket_logger.rs
+++ b/src/ping_result_processors/ping_result_processor_latency_bucket_logger.rs
@@ -1,5 +1,4 @@
-use crate::ping_result_processors::ping_result_processor::PingResultProcessor;
-use crate::PingResult;
+use crate::*;
 use contracts::requires;
 use std::time::Duration;
 use tracing;
diff --git a/src/ping_result_processors/ping_result_processor_latency_scatter_logger.rs b/src/ping_result_processors/ping_result_processor_latency_scatter_logger.rs
index b480881..f4aee90 100644
--- a/src/ping_result_processors/ping_result_processor_latency_scatter_logger.rs
+++ b/src/ping_result_processors/ping_result_processor_latency_scatter_logger.rs
@@ -1,5 +1,4 @@
-use crate::ping_result_processors::ping_result_processor::PingResultProcessor;
-use crate::PingResult;
+use crate::*;
 use std::collections::BTreeMap;
 use tracing;
 
diff --git a/src/ping_result_processors/ping_result_processor_result_scatter_logger.rs b/src/ping_result_processors/ping_result_processor_result_scatter_logger.rs
index cf10f53..67a1f0a 100644
--- a/src/ping_result_processors/ping_result_processor_result_scatter_logger.rs
+++ b/src/ping_result_processors/ping_result_processor_result_scatter_logger.rs
@@ -1,6 +1,4 @@
-use crate::ping_clients::ping_client::{PingClientError, PingClientWarning};
-use crate::ping_result_processors::ping_result_processor::PingResultProcessor;
-use crate::PingResult;
+use crate::*;
 use std::collections::BTreeMap;
 use tracing;
 
@@ -46,7 +44,9 @@ impl PingResultProcessorResultScatterLogger {
 }
 
 impl PingResultProcessor for PingResultProcessorResultScatterLogger {
-    fn name(&self) -> &'static str { "ResultScatterLogger" }
+    fn name(&self) -> &'static str {
+        "ResultScatterLogger"
+    }
 
     fn process_ping_result(&mut self, ping_result: &PingResult) {
         // Skip warmup pings in analysis.
@@ -108,8 +108,9 @@ impl PingResultProcessor for PingResultProcessorResultScatterLogger {
             for (port_bucket, result_hits) in iteration {
                 print!("{:>5} | {:>5} | ", iteration_index, port_bucket);
 
-                let result =
-                    PingResultProcessorResultScatterLogger::convert_result_hits_to_string(result_hits);
+                let result = PingResultProcessorResultScatterLogger::convert_result_hits_to_string(
+                    result_hits,
+                );
                 println!("{}", result);
             }
         }
diff --git a/src/ping_result_processors/ping_result_processor_test_common.rs b/src/ping_result_processors/ping_result_processor_test_common.rs
index 078e808..20b24c8 100644
--- a/src/ping_result_processors/ping_result_processor_test_common.rs
+++ b/src/ping_result_processors/ping_result_processor_test_common.rs
@@ -1,4 +1,4 @@
-use crate::ping_result_processors::ping_result_processor::PingResultProcessor;
+use crate::PingResultProcessor;
 use crate::rnp_test_common;
 
 pub fn run_ping_result_processor_with_test_samples(
diff --git a/src/ping_result_processors/ping_result_processor_text_logger.rs b/src/ping_result_processors/ping_result_processor_text_logger.rs
index 501ed29..322fa00 100644
--- a/src/ping_result_processors/ping_result_processor_text_logger.rs
+++ b/src/ping_result_processors/ping_result_processor_text_logger.rs
@@ -1,5 +1,4 @@
-use crate::ping_result_processors::ping_result_processor::PingResultProcessor;
-use crate::{rnp_utils, PingResult};
+use crate::*;
 use std::fs::File;
 use std::io::prelude::*;
 use std::path::PathBuf;