diff --git a/link-for-later/src/app.rs b/link-for-later/src/app.rs
index be88630..22a7e43 100644
--- a/link-for-later/src/app.rs
+++ b/link-for-later/src/app.rs
@@ -1,5 +1,4 @@
-use std::sync::Arc;
-use std::{error, fmt};
+use std::{error, fmt, sync::Arc};
 
 use axum::Router;
 
@@ -28,8 +27,8 @@ pub fn new(db: Database) -> Router {
 
     let state = State::new(links_service, users_service, links_repo, users_repo);
     Router::new()
-        .merge(controller::routes::links::routes(state.clone()))
-        .merge(controller::routes::users::routes(state.clone()))
+        .merge(controller::routes::links::router(state.clone()))
+        .merge(controller::routes::users::router(state.clone()))
         .with_state(state)
 }
 
diff --git a/link-for-later/src/controller/routes/links.rs b/link-for-later/src/controller/routes/links.rs
index 5a29004..05bb7e4 100644
--- a/link-for-later/src/controller/routes/links.rs
+++ b/link-for-later/src/controller/routes/links.rs
@@ -12,7 +12,7 @@ use crate::{
     types::{AppError, AppState},
 };
 
-pub fn routes(state: AppState) -> Router<AppState> {
+pub fn router(state: AppState) -> Router<AppState> {
     Router::new()
         .nest(
             "/v1",
diff --git a/link-for-later/src/controller/routes/users.rs b/link-for-later/src/controller/routes/users.rs
index 7131795..c12bcb6 100644
--- a/link-for-later/src/controller/routes/users.rs
+++ b/link-for-later/src/controller/routes/users.rs
@@ -7,7 +7,7 @@ use crate::{
     types::{AppError, AppState},
 };
 
-pub fn routes(state: AppState) -> Router<AppState> {
+pub fn router(state: AppState) -> Router<AppState> {
     Router::new()
         .nest(
             "/v1",
diff --git a/link-for-later/src/lib.rs b/link-for-later/src/lib.rs
index 72baab0..502aead 100644
--- a/link-for-later/src/lib.rs
+++ b/link-for-later/src/lib.rs
@@ -1,6 +1,6 @@
 #![warn(clippy::all, clippy::pedantic, clippy::nursery, clippy::cargo)]
 
-pub use crate::types::Database as DatabaseType;
+pub use types::Database as DatabaseType;
 pub mod app;
 
 mod controller;
diff --git a/link-for-later/src/types.rs b/link-for-later/src/types.rs
index 8980abc..de41248 100644
--- a/link-for-later/src/types.rs
+++ b/link-for-later/src/types.rs
@@ -1,9 +1,7 @@
-use crate::app;
-
 pub type Result<T> = std::result::Result<T, AppError>;
 
-pub type AppState = app::State;
-pub type AppError = app::Error;
+pub type AppState = crate::app::State;
+pub type AppError = crate::app::Error;
 
 pub enum Database {
     MongoDb(mongodb::Database),