diff --git a/src/cloud_provider/aws/databases/mod.rs b/src/cloud_provider/aws/databases/mod.rs
index d9965770..21613258 100644
--- a/src/cloud_provider/aws/databases/mod.rs
+++ b/src/cloud_provider/aws/databases/mod.rs
@@ -1,11 +1,12 @@
-use crate::cloud_provider::common::kubernetes::get_stateless_resource_information_for_user;
-use crate::cloud_provider::service::Service;
-use crate::cloud_provider::DeploymentTarget;
 pub use mongodb::MongoDB;
 pub use mysql::MySQL;
 pub use postgresql::PostgreSQL;
 pub use redis::Redis;
 
+use crate::cloud_provider::common::kubernetes::get_stateless_resource_information_for_user;
+use crate::cloud_provider::service::Service;
+use crate::cloud_provider::DeploymentTarget;
+
 mod mongodb;
 mod mysql;
 mod postgresql;
diff --git a/src/cloud_provider/aws/kubernetes/mod.rs b/src/cloud_provider/aws/kubernetes/mod.rs
index 75bc86af..3ce7d514 100644
--- a/src/cloud_provider/aws/kubernetes/mod.rs
+++ b/src/cloud_provider/aws/kubernetes/mod.rs
@@ -1,3 +1,4 @@
+use std::fs::File;
 use std::str::FromStr;
 
 use itertools::Itertools;
@@ -7,6 +8,7 @@ use tera::Context as TeraContext;
 
 use crate::cloud_provider::aws::kubernetes::node::Node;
 use crate::cloud_provider::aws::AWS;
+use crate::cloud_provider::common::worker_node_data_template::WorkerNodeDataTemplate;
 use crate::cloud_provider::environment::Environment;
 use crate::cloud_provider::kubernetes::{Kind, Kubernetes, KubernetesNode, Resources};
 use crate::cloud_provider::{kubernetes, CloudProvider};
@@ -23,7 +25,6 @@ use crate::models::{
 use crate::string::terraform_list_format;
 use crate::unit_conversion::{cpu_string_to_float, ki_to_mi};
 use crate::{dns_provider, s3};
-use std::fs::File;
 
 pub mod node;
 
@@ -787,11 +788,3 @@ impl<'a> Listen for EKS<'a> {
 fn get_s3_kubeconfig_bucket_name(id: String) -> String {
     format!("qovery-kubeconfigs-{}", id)
 }
-
-#[derive(Serialize, Deserialize)]
-struct WorkerNodeDataTemplate {
-    instance_type: String,
-    desired_size: String,
-    max_size: String,
-    min_size: String,
-}
diff --git a/src/cloud_provider/digitalocean/application.rs b/src/cloud_provider/digitalocean/application.rs
index 3cb6f80c..73051e88 100644
--- a/src/cloud_provider/digitalocean/application.rs
+++ b/src/cloud_provider/digitalocean/application.rs
@@ -281,6 +281,7 @@ impl Pause for Application {
         unimplemented!()
     }
 }
+
 impl crate::cloud_provider::service::Application for Application {
     fn image(&self) -> &Image {
         &self.image
diff --git a/src/cloud_provider/digitalocean/databases/postgresql.rs b/src/cloud_provider/digitalocean/databases/postgresql.rs
index 34f058c8..24e5d9f1 100644
--- a/src/cloud_provider/digitalocean/databases/postgresql.rs
+++ b/src/cloud_provider/digitalocean/databases/postgresql.rs
@@ -1,9 +1,10 @@
+use tera::Context as TeraContext;
+
 use crate::cloud_provider::kubernetes::Kubernetes;
 use crate::cloud_provider::service::{Create, DatabaseOptions};
 use crate::cloud_provider::DeploymentTarget;
 use crate::error::EngineError;
 use crate::models::{Action, Context, Environment};
-use tera::Context as TeraContext;
 
 pub struct PostgreSQL {
     context: Context,
diff --git a/src/cloud_provider/digitalocean/kubernetes/cidr.rs b/src/cloud_provider/digitalocean/kubernetes/cidr.rs
index c97d5834..c4560a3b 100644
--- a/src/cloud_provider/digitalocean/kubernetes/cidr.rs
+++ b/src/cloud_provider/digitalocean/kubernetes/cidr.rs
@@ -1,9 +1,11 @@
-use crate::cmd::utilities;
-use serde::{Deserialize, Serialize};
 use std::borrow::Borrow;
 use std::collections::hash_map::RandomState;
 use std::collections::HashMap;
 
+use serde::{Deserialize, Serialize};
+
+use crate::cmd::utilities;
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct DoVpc {
     id: String,
diff --git a/src/cloud_provider/digitalocean/kubernetes/node.rs b/src/cloud_provider/digitalocean/kubernetes/node.rs
index 9bcc6682..7ef5fbaf 100644
--- a/src/cloud_provider/digitalocean/kubernetes/node.rs
+++ b/src/cloud_provider/digitalocean/kubernetes/node.rs
@@ -1,6 +1,7 @@
-use crate::cloud_provider::kubernetes::KubernetesNode;
 use std::any::Any;
 
+use crate::cloud_provider::kubernetes::KubernetesNode;
+
 pub struct Node {
     instance_type: String,
 }
@@ -46,4 +47,4 @@ impl KubernetesNode for Node {
     fn as_any(&self) -> &dyn Any {
         self
     }
-}
\ No newline at end of file
+}
diff --git a/src/cloud_provider/digitalocean/mod.rs b/src/cloud_provider/digitalocean/mod.rs
index 72d44ced..eeb497e2 100644
--- a/src/cloud_provider/digitalocean/mod.rs
+++ b/src/cloud_provider/digitalocean/mod.rs
@@ -1,10 +1,3 @@
-pub mod api_structs;
-pub mod application;
-pub mod common;
-pub mod databases;
-pub mod kubernetes;
-pub(crate) mod router;
-
 extern crate digitalocean;
 
 use std::any::Any;
@@ -16,6 +9,13 @@ use crate::constants::DIGITAL_OCEAN_TOKEN;
 use crate::error::{EngineError, EngineErrorCause};
 use crate::models::{Context, Listener, Listeners};
 
+pub mod api_structs;
+pub mod application;
+pub mod common;
+pub mod databases;
+pub mod kubernetes;
+pub(crate) mod router;
+
 pub struct DO {
     context: Context,
     id: String,
diff --git a/src/cloud_provider/kubernetes.rs b/src/cloud_provider/kubernetes.rs
index 2eaa5ca8..f9b22acc 100644
--- a/src/cloud_provider/kubernetes.rs
+++ b/src/cloud_provider/kubernetes.rs
@@ -1,4 +1,6 @@
 use std::any::Any;
+use std::fs::File;
+use std::thread;
 
 use serde::{Deserialize, Serialize};
 
@@ -9,8 +11,6 @@ use crate::cmd::kubectl;
 use crate::dns_provider::DnsProvider;
 use crate::error::{EngineError, EngineErrorCause, EngineErrorScope};
 use crate::models::{Context, Listen, ListenersHelper, ProgressInfo, ProgressLevel, ProgressScope};
-use std::fs::File;
-use std::thread;
 
 pub trait Kubernetes: Listen {
     fn context(&self) -> &Context;
diff --git a/src/cloud_provider/service.rs b/src/cloud_provider/service.rs
index e2bb1e81..73e5d60c 100644
--- a/src/cloud_provider/service.rs
+++ b/src/cloud_provider/service.rs
@@ -1,6 +1,10 @@
 use std::net::TcpStream;
 
+use retry::delay::Fixed;
+use retry::OperationResult;
 use tera::Context as TeraContext;
+use trust_dns_resolver::config::{ResolverConfig, ResolverOpts};
+use trust_dns_resolver::Resolver;
 
 use crate::build_platform::Image;
 use crate::cloud_provider::environment::Environment;
@@ -8,10 +12,6 @@ use crate::cloud_provider::kubernetes::Kubernetes;
 use crate::cloud_provider::DeploymentTarget;
 use crate::error::{EngineError, EngineErrorCause, EngineErrorScope};
 use crate::models::{Context, Listen, ListenersHelper, ProgressInfo, ProgressLevel, ProgressScope};
-use retry::delay::Fixed;
-use retry::OperationResult;
-use trust_dns_resolver::config::{ResolverConfig, ResolverOpts};
-use trust_dns_resolver::Resolver;
 
 pub trait Service {
     fn context(&self) -> &Context;
diff --git a/src/cmd/helm.rs b/src/cmd/helm.rs
index b27c56c1..b73d9ef8 100644
--- a/src/cmd/helm.rs
+++ b/src/cmd/helm.rs
@@ -1,9 +1,11 @@
+use std::io::Error;
+use std::path::Path;
+
+use tracing::{error, info, span, Level};
+
 use crate::cmd::structs::{Helm, HelmHistoryRow};
 use crate::cmd::utilities::exec_with_envs_and_output;
 use crate::error::{SimpleError, SimpleErrorKind};
-use std::io::Error;
-use std::path::Path;
-use tracing::{error, info, span, Level};
 
 const HELM_DEFAULT_TIMEOUT_IN_SECONDS: u32 = 300;
 
diff --git a/src/cmd/terraform.rs b/src/cmd/terraform.rs
index 9fea660a..3ba0bddf 100644
--- a/src/cmd/terraform.rs
+++ b/src/cmd/terraform.rs
@@ -1,10 +1,10 @@
 use dirs::home_dir;
+use retry::delay::Fixed;
+use retry::OperationResult;
 
 use crate::cmd::utilities::exec_with_envs_and_output;
 use crate::constants::TF_PLUGIN_CACHE_DIR;
 use crate::error::{SimpleError, SimpleErrorKind};
-use retry::delay::Fixed;
-use retry::OperationResult;
 
 fn terraform_exec_with_init_validate_plan(root_dir: &str) -> Result<(), SimpleError> {
     // terraform init
diff --git a/src/container_registry/docker_hub.rs b/src/container_registry/docker_hub.rs
index a315d061..88ed2431 100644
--- a/src/container_registry/docker_hub.rs
+++ b/src/container_registry/docker_hub.rs
@@ -1,11 +1,13 @@
+extern crate reqwest;
+
+use reqwest::StatusCode;
+
 use crate::build_platform::Image;
 use crate::cmd;
 use crate::container_registry::{ContainerRegistry, EngineError, Kind, PushResult};
 use crate::error::EngineErrorCause;
 use crate::models::{Context, Listener, Listeners};
-extern crate reqwest;
 
-use reqwest::StatusCode;
 pub struct DockerHub {
     context: Context,
     id: String,
diff --git a/src/object_storage/do_space.rs b/src/object_storage/do_space.rs
index 66a077ce..a3c6857f 100644
--- a/src/object_storage/do_space.rs
+++ b/src/object_storage/do_space.rs
@@ -1,7 +1,8 @@
+use std::path::Path;
+
 use rusoto_core::{Client, HttpClient, Region};
 use rusoto_credential::StaticProvider;
 use rusoto_s3::{GetObjectRequest, S3Client, S3};
-use std::path::Path;
 use tokio::{fs::File, io};
 
 pub(crate) async fn download_space_object(
diff --git a/src/template.rs b/src/template.rs
index 2a3f8cfe..cd7ba49a 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -1,15 +1,16 @@
 use std::ffi::OsStr;
 use std::fs;
 use std::fs::File;
-use std::io::{Write};
+use std::io::Write;
 use std::os::unix::fs::PermissionsExt;
 use std::path::Path;
 
-use crate::error::{SimpleError, SimpleErrorKind};
 use tera::Error as TeraError;
 use tera::{Context, Tera};
 use walkdir::WalkDir;
 
+use crate::error::{SimpleError, SimpleErrorKind};
+
 pub fn generate_and_copy_all_files_into_dir<S, P>(
     from_dir: S,
     to_dir: P,
diff --git a/src/utilities.rs b/src/utilities.rs
index ba6ecfb9..073430f8 100644
--- a/src/utilities.rs
+++ b/src/utilities.rs
@@ -1,8 +1,9 @@
-use crate::error::StringError;
 use core::option::Option::{None, Some};
 use core::result::Result;
 use core::result::Result::{Err, Ok};
 
+use crate::error::StringError;
+
 // unfortunately some proposed versions are not SemVer like Elasticache (6.x)
 // this is why we need ot have our own structure
 pub struct VersionsNumber {