diff --git a/src/main.rs b/src/main.rs
index fd62c6c..2eb1573 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,11 +8,15 @@ mod transfer_info;
 use crate::cli::args::Args;
 use dotenv::dotenv;
 use tracing::error;
+use tracing_subscriber::filter::EnvFilter;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     dotenv().ok();
-    env_logger::init();
+    tracing_subscriber::fmt()
+        .with_env_filter(EnvFilter::from_default_env())
+        .init();
+    // env_logger::init();
     let args = Args::new();
     if let Err(e) = args.run().await {
         error!("{e}");
diff --git a/src/receiver/client.rs b/src/receiver/client.rs
index 0a3fe8f..3302c77 100644
--- a/src/receiver/client.rs
+++ b/src/receiver/client.rs
@@ -17,7 +17,7 @@ pub async fn download_info(relay: &str, name: &str) -> Result<TransferInfoReques
         Ok(resp) => {
             let json = resp.json::<TransferInfoRequest>().await?;
             debug!("Json Response: {:#?}", json);
-            if json.message == "error".to_string() {
+            if json.message == *"error" {
                 Err(Box::new(TransferNotFoundError::new(
                     "no transfer with given name found",
                 )))
diff --git a/src/relay/server.rs b/src/relay/server.rs
index eae6124..ab32edb 100644
--- a/src/relay/server.rs
+++ b/src/relay/server.rs
@@ -144,20 +144,20 @@ async fn download_success(
         debug!("Found Transfer by name '{name}'");
         data.remove(index);
         debug!("Transfer deleted");
-        return (
+        (
             StatusCode::OK,
             Json(json!({
                 "message": "transfer deleted"
             })),
-        );
+        )
     } else {
         warn!("couldn't find transfer-name: {}", name);
-        return (
+        (
             StatusCode::NOT_FOUND,
             Json(json!({
                 "message": "transfer not found"
             })),
-        );
+        )
     }
     // match data.iter().find(|request| request.body.name == name) {
     //     Some(request) => {
diff --git a/src/sender/server.rs b/src/sender/server.rs
index b0eedf5..c6aadcd 100644
--- a/src/sender/server.rs
+++ b/src/sender/server.rs
@@ -1,4 +1,3 @@
-use crate::transfer_info::transfer_info::{TransferInfoBody, TransferInfoRequest};
 use axum::{
     extract::Json,
     http::StatusCode,