diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7398193..c37c0c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +1,12 @@
 cmake_minimum_required (VERSION 2.6)
 project(auth_service)
 set(CMAKE_CXX_STANDARD 17)
-
 include_directories(./src/libs/ ./src)
-
 add_executable(
     auth_service 
     src/auth_service.cpp 
-
     src/auth/auth.cpp
     src/auth/verify_auth.cpp 
-    
     src/users/access_request.cpp
     src/users/change_password.cpp
     src/users/delete_user.cpp
@@ -18,12 +14,8 @@ add_executable(
     src/users/get_all_users.cpp
     src/users/get_user.cpp
     src/users/change_user.cpp
-
     src/security/cors.cpp
-
     src/AuthService/AuthService.cpp
 )
-
 target_link_libraries(auth_service ssl crypto)
-
 install(TARGETS auth_service DESTINATION bin)
diff --git a/Makefile b/Makefile
index 59e757b..4f49365 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,14 @@
 CXX=g++
-CXXFLAGS=-Wall -l ssl -l crypto -I src/libs -I src/auth -I src/security -I src/users
-SOURCES=src/auth_service.cpp src/auth/auth.cpp src/auth/verify_auth.cpp src/security/cors.cpp src/users/access_request.cpp src/users/add_user.cpp src/users/change_password.cpp src/users/change_user.cpp src/users/delete_user.cpp src/users/get_all_users.cpp src/users/get_user.cpp
+CXXFLAGS=-Wall -l ssl -l crypto -I src/libs -I src/auth -I src/security -I src/users -I src
+SOURCES=src/auth_service.cpp src/auth/auth.cpp src/auth/verify_auth.cpp src/security/cors.cpp src/users/access_request.cpp src/users/add_user.cpp src/users/change_password.cpp src/users/change_user.cpp src/users/delete_user.cpp src/users/get_all_users.cpp src/users/get_user.cpp src/AuthService/AuthService.cpp
 TARGET=bin/auth_service
-
 default: all
-
 all: build
-
 build:
 	@if [ ! -d bin ]; then \
 		mkdir bin; \
 	fi
 	$(CXX) -o $(TARGET) $(SOURCES) $(CXXFLAGS)
-
 clean:
 	@if [ -f $(TARGET) ]; then \
 		rm -v $(TARGET); \
diff --git a/meson.build b/meson.build
index 7102b39..3cab934 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,20 @@
 project('auth_service', 'cpp')
 include_dirs = include_directories('src', 'src/libs')
 deps = dependency('openssl')
-executable('auth_service', 'src/auth_service.cpp', 'src/users/access_request.cpp', 'src/users/add_user.cpp', 'src/users/change_password.cpp', 'src/users/change_user.cpp', 'src/users/delete_user.cpp', 'src/users/get_all_users.cpp', 'src/users/get_user.cpp', 'src/security/cors.cpp', 'src/AuthService/AuthService.cpp', 'src/auth/auth.cpp', 'src/auth/verify_auth.cpp', include_directories : include_dirs, dependencies : deps)
+executable(
+    'auth_service', 
+    'src/auth_service.cpp', 
+    'src/users/access_request.cpp', 
+    'src/users/add_user.cpp', 
+    'src/users/change_password.cpp', 
+    'src/users/change_user.cpp', 
+    'src/users/delete_user.cpp', 
+    'src/users/get_all_users.cpp', 
+    'src/users/get_user.cpp', 
+    'src/security/cors.cpp', 
+    'src/AuthService/AuthService.cpp', 
+    'src/auth/auth.cpp', 
+    'src/auth/verify_auth.cpp', 
+    include_directories : include_dirs, 
+    dependencies : deps
+)