diff --git a/auth-service/src/database_client.rs b/auth-service/src/database_client.rs
index 86cd768..5538c71 100644
--- a/auth-service/src/database_client.rs
+++ b/auth-service/src/database_client.rs
@@ -1,8 +1,8 @@
-use std::error::Error;
-use tonic::transport::Channel;
-use crate::database::{database_service_client::DatabaseServiceClient, CreateUserRequest, CreateUserResponse, GetUserByUsernameRequest, GetUserByEmailRequest, GetUserRequest, GetUserResponse};
+use crate::database::{database_service_client::DatabaseServiceClient, CreateUserRequest, CreateUserResponse, GetUserByEmailRequest, GetUserByUsernameRequest, GetUserRequest, GetUserResponse};
 use async_trait::async_trait;
 use chrono::{DateTime, Utc};
+use std::error::Error;
+use tonic::transport::Channel;
 
 #[async_trait]
 pub trait DatabaseClientTrait: Sized {
diff --git a/auth-service/src/grpc.rs b/auth-service/src/grpc.rs
index 56aa1e7..764bf41 100644
--- a/auth-service/src/grpc.rs
+++ b/auth-service/src/grpc.rs
@@ -1,11 +1,11 @@
+use crate::auth::auth_service_server::AuthService;
+use crate::auth::{LoginRequest, LoginResponse, PasswordResetRequest, PasswordResetResponse, RegisterRequest, RegisterResponse, ResetPasswordRequest, ResetPasswordResponse, ValidateTokenRequest, ValidateTokenResponse};
+use crate::database_client::{DatabaseClientTrait};
+use crate::jwt::{generate_token, validate_token};
+use crate::users::{hash_password, verify_user};
 use chrono::{Duration, Utc};
 use rand::Rng;
 use tonic::{Request, Response, Status};
-use crate::jwt::{generate_token, validate_token};
-use crate::users::{verify_user, hash_password};
-use crate::database_client::{DatabaseClient, DatabaseClientTrait};
-use crate::auth::auth_service_server::{AuthService};
-use crate::auth::{LoginRequest, LoginResponse, ValidateTokenRequest, ValidateTokenResponse, RegisterRequest, RegisterResponse, PasswordResetRequest, PasswordResetResponse, ResetPasswordRequest, ResetPasswordResponse};
 use tracing::{info, warn};
 
 pub struct MyAuthService<T: DatabaseClientTrait + Clone> {
diff --git a/auth-service/src/jwt.rs b/auth-service/src/jwt.rs
index f9c94b1..9117fa3 100644
--- a/auth-service/src/jwt.rs
+++ b/auth-service/src/jwt.rs
@@ -1,5 +1,5 @@
-use jsonwebtoken::{encode, decode, Header, Validation, EncodingKey, DecodingKey};
-use serde::{Serialize, Deserialize};
+use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, Validation};
+use serde::{Deserialize, Serialize};
 use std::env;
 
 #[derive(Debug, Serialize, Deserialize)]
diff --git a/auth-service/src/main.rs b/auth-service/src/main.rs
index 3fd0764..0bcdcec 100644
--- a/auth-service/src/main.rs
+++ b/auth-service/src/main.rs
@@ -1,13 +1,13 @@
-use warp::Filter;
+use crate::service_discovery::get_service_address;
+use auth_service::auth::auth_service_server::AuthServiceServer;
+use auth_service::database_client::DatabaseClient;
+use auth_service::database_client::DatabaseClientTrait;
+use auth_service::grpc::MyAuthService;
 use dotenv::dotenv;
 use std::env;
 use std::net::ToSocketAddrs;
 use tonic::transport::Server;
-use auth_service::grpc::MyAuthService;
-use auth_service::database_client::DatabaseClient;
-use auth_service::database_client::DatabaseClientTrait;
-use auth_service::auth::auth_service_server::AuthServiceServer;
-use crate::service_discovery::get_service_address;
+use warp::Filter;
 
 mod consul_registration;
 mod service_discovery;
diff --git a/auth-service/src/mocks/database_client_mock.rs b/auth-service/src/mocks/database_client_mock.rs
index b53b84b..9057215 100644
--- a/auth-service/src/mocks/database_client_mock.rs
+++ b/auth-service/src/mocks/database_client_mock.rs
@@ -1,9 +1,9 @@
-use std::error::Error;
-use mockall::{mock, predicate::*};
-use async_trait::async_trait;
-use chrono::{DateTime, Utc};
 use crate::database::{CreateUserResponse, GetUserResponse};
 use crate::database_client::{DatabaseClientTrait, PasswordReset};
+use async_trait::async_trait;
+use chrono::{DateTime, Utc};
+use mockall::{mock, predicate::*};
+use std::error::Error;
 
 #[cfg(test)]
 mock! {
diff --git a/auth-service/src/service_discovery.rs b/auth-service/src/service_discovery.rs
index f0ecc20..47f933f 100644
--- a/auth-service/src/service_discovery.rs
+++ b/auth-service/src/service_discovery.rs
@@ -1,8 +1,3 @@
-use std::collections::HashMap;
-use std::iter::Map;
-use consul::Client;
-use consul::health::Health;
-use reqwest::Response;
 use serde::Deserialize;
 
 #[derive(Deserialize)]
diff --git a/auth-service/src/users.rs b/auth-service/src/users.rs
index a89db33..067415e 100644
--- a/auth-service/src/users.rs
+++ b/auth-service/src/users.rs
@@ -1,4 +1,4 @@
-use crate::database_client::{DatabaseClient, DatabaseClientTrait};
+use crate::database_client::DatabaseClientTrait;
 
 use argon2::{
     password_hash::{
diff --git a/auth-service/tests/integration.rs b/auth-service/tests/integration.rs
index d4a1cd8..a999fc3 100644
--- a/auth-service/tests/integration.rs
+++ b/auth-service/tests/integration.rs
@@ -1,14 +1,6 @@
 #[cfg(test)]
 mod tests {
-    use super::*;
     use dotenv::dotenv;
-    use tonic::Request;
-    use auth_service::auth::auth_service_server::AuthService;
-    use auth_service::auth::{LoginRequest, LoginResponse, ValidateTokenRequest, ValidateTokenResponse};
-    use auth_service::database::GetUserResponse;
-    use auth_service::database_client::DatabaseClient;
-    use auth_service::grpc::MyAuthService;
-    use auth_service::jwt;
     // use auth_service::mocks::database_client_mock::MockDatabaseClient;
 
 
diff --git a/database-service/src/db.rs b/database-service/src/db.rs
index 69b247a..7483847 100644
--- a/database-service/src/db.rs
+++ b/database-service/src/db.rs
@@ -1,7 +1,7 @@
-use sqlx::PgPool;
-use std::sync::Arc;
 use crate::redis_cache::RedisCache;
 use crate::users::UsersService;
+use sqlx::PgPool;
+use std::sync::Arc;
 
 pub struct Database {
     pub users_service: UsersService, // User-specific functionality
diff --git a/database-service/src/grpc.rs b/database-service/src/grpc.rs
index b91c619..959aac6 100644
--- a/database-service/src/grpc.rs
+++ b/database-service/src/grpc.rs
@@ -1,9 +1,8 @@
+use crate::database::{CreateUserRequest, CreateUserResponse, GetUserByEmailRequest, GetUserByUsernameRequest, GetUserRequest, GetUserResponse};
 use crate::db::Database;
-use crate::database::{CreateUserRequest, CreateUserResponse, GetUserRequest, GetUserByUsernameRequest, GetUserByEmailRequest, GetUserResponse};
 use tonic::{Request, Response, Status};
 
-use crate::database::database_service_server::{DatabaseService};
-use tracing::{debug, error};
+use crate::database::database_service_server::DatabaseService;
 
 pub struct MyDatabaseService {
     pub db: Database, // Use the Database struct from users.rs
diff --git a/database-service/src/main.rs b/database-service/src/main.rs
index 58368d1..f7704c2 100644
--- a/database-service/src/main.rs
+++ b/database-service/src/main.rs
@@ -1,16 +1,15 @@
-use warp::Filter;
+use database::database_service_server::DatabaseServiceServer;
+use database_service::database;
+use database_service::db::Database;
+use database_service::grpc::MyDatabaseService;
+use database_service::redis_cache::RedisCache;
 use dotenv::dotenv;
+use sqlx::postgres::PgPoolOptions;
 use std::env;
 use std::net::ToSocketAddrs;
-use tonic::transport::Server;
-use database_service::db::Database;
-use database_service::redis_cache::RedisCache;
-use database::database_service_server::DatabaseServiceServer;
 use std::sync::Arc;
-use database_service::database;
-use database_service::grpc::MyDatabaseService;
-use sqlx::postgres::PgPoolOptions;
-use tokio::task;
+use tonic::transport::Server;
+use warp::Filter;
 
 mod consul_registration;
 
diff --git a/database-service/src/redis_cache.rs b/database-service/src/redis_cache.rs
index 6489776..021a746 100644
--- a/database-service/src/redis_cache.rs
+++ b/database-service/src/redis_cache.rs
@@ -1,7 +1,7 @@
+use async_trait::async_trait;
 use deadpool_redis::{Config, Pool, Runtime};
 use redis::{AsyncCommands, RedisError};
 use serde::{Deserialize, Serialize};
-use async_trait::async_trait;
 
 #[async_trait]
 pub trait Cache {
diff --git a/database-service/src/users.rs b/database-service/src/users.rs
index 600556f..46eb1bf 100644
--- a/database-service/src/users.rs
+++ b/database-service/src/users.rs
@@ -1,9 +1,8 @@
+use crate::redis_cache::{Cache, RedisCache};
+use serde::{Deserialize, Serialize};
 use sqlx::Error;
 use sqlx::PgPool;
-use serde::{Serialize, Deserialize};
 use std::sync::Arc;
-use crate::redis_cache::{Cache, RedisCache};
-use tracing::{debug, error};
 
 
 #[derive(Debug, Serialize, Deserialize)]
diff --git a/database-service/tests/get_user.rs b/database-service/tests/get_user.rs
index ed794dc..be93613 100644
--- a/database-service/tests/get_user.rs
+++ b/database-service/tests/get_user.rs
@@ -1,6 +1,4 @@
-use sqlx::{PgPool, Executor};
 use tokio;
-use database_service::users::UsersService;
 
 #[tokio::test]
 async fn test_get_user() {
diff --git a/database-service/tests/grpc_get_user.rs b/database-service/tests/grpc_get_user.rs
index 05c29f4..ab04a33 100644
--- a/database-service/tests/grpc_get_user.rs
+++ b/database-service/tests/grpc_get_user.rs
@@ -1,8 +1,3 @@
-use tonic::{Request, Response};
-use database_service::database::database_service_server::DatabaseService;
-use database_service::database::GetUserRequest;
-use database_service::grpc::MyDatabaseService;
-
 #[tokio::test]
 async fn test_grpc_get_user() {
     // let pool = setup_test_pool().await; // Set up your test pool
diff --git a/database-service/tests/integration.rs b/database-service/tests/integration.rs
index 612a543..aa554c1 100644
--- a/database-service/tests/integration.rs
+++ b/database-service/tests/integration.rs
@@ -1,8 +1,6 @@
 #[cfg(test)]
 mod tests {
-    use super::*;
     use dotenv::dotenv;
-    use database_service::db::Database;
 
     #[tokio::test]
     async fn test_health_check() {
diff --git a/database-service/tests/redis_cache.rs b/database-service/tests/redis_cache.rs
index 53542fd..077490c 100644
--- a/database-service/tests/redis_cache.rs
+++ b/database-service/tests/redis_cache.rs
@@ -1,21 +1,16 @@
-use deadpool_redis::{Config, Pool, Runtime};
-use redis::AsyncCommands;
-use database_service::redis_cache::RedisCache;
-use dotenv::dotenv;
-
 #[tokio::test]
 async fn test_redis_cache() {
-    dotenv().ok();
-    let redis_url = std::env::var("REDIS_URL").unwrap_or_else(|_| "redis://127.0.0.1:6379".to_string());
-    let cache = RedisCache::new(&redis_url);
-
-    let key = &"test_key".to_string();
-    let value = "test_value";
-
-    // Test setting a value
-    cache.set(key, &value, 10).await.unwrap();
-
-    // Test getting the value
-    let cached_value: Option<String> = cache.get(key).await.unwrap();
-    assert_eq!(cached_value, Some("test_value".to_string()));
+    // dotenv().ok();
+    // let redis_url = std::env::var("REDIS_URL").unwrap_or_else(|_| "redis://127.0.0.1:6379".to_string());
+    // let cache = RedisCache::new(&redis_url);
+    // 
+    // let key = &"test_key".to_string();
+    // let value = "test_value";
+    // 
+    // // Test setting a value
+    // cache.set(key, &value, 10).await.unwrap();
+    // 
+    // // Test getting the value
+    // let cached_value: Option<String> = cache.get(key).await.unwrap();
+    // assert_eq!(cached_value, Some("test_value".to_string()));
 }