diff --git a/Makefile b/Makefile
index f9fb2b2..b447634 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/25 16:09:27 by adjoly            #+#    #+#              #
-#    Updated: 2025/04/15 17:53:00 by adjoly           ###   ########.fr        #
+#    Updated: 2025/04/22 14:31:00 by adjoly           ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -14,7 +14,7 @@ SHELL = bash
 
 NAME = webserv
 
-CC = c++
+CC = clang++
 
 OBJSDIR = obj/
 
diff --git a/includes/config/Server.hpp b/includes/config/Server.hpp
index a6cca82..fb3f72b 100644
--- a/includes/config/Server.hpp
+++ b/includes/config/Server.hpp
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/03/19 14:11:28 by adjoly            #+#    #+#             */
-/*   Updated: 2025/04/22 12:44:16 by adjoly           ###   ########.fr       */
+/*   Updated: 2025/04/22 14:25:17 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -59,23 +59,9 @@ class Server {
 	int getPort(void) { return _port; }
 
 	// @brief	Can be used to check if a servername is present in this config
-	bool isServerName(const std::string &server_name) {
-		for (auto it = prange(_server_names)) {
-			if (*it == server_name) {
-				return true;
-			}
-		}
-		return false;
-	}
+	bool	isServerName(const std::string &);
 
-	Route	*whatRoute(const URL &url) {
-		for (auto it = prange(_routes)) {
-			if (it->first == url) {
-				return it->second;
-			}
-		}
-		return not_nullptr;
-	}
+	Route	*whatRoute(const URL &);
 
   protected:
   private:
diff --git a/includes/server/Client.hpp b/includes/server/Client.hpp
index 035a1fe..2d660ff 100644
--- a/includes/server/Client.hpp
+++ b/includes/server/Client.hpp
@@ -6,16 +6,16 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/04/14 14:14:39 by adjoly            #+#    #+#             */
-/*   Updated: 2025/04/22 12:04:57 by mmoussou         ###   ########.fr       */
+/*   Updated: 2025/04/22 14:23:44 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #pragma once
 
 #include <config/default.hpp>
-#include <server/default.hpp>
-#include <requests/default.hpp>
 #include <netinet/in.h>
+#include <requests/default.hpp>
+#include <server/default.hpp>
 #include <webserv.hpp>
 
 namespace webserv {
@@ -26,10 +26,10 @@ class Client {
 	Client(int, sockaddr_in, config::Config *);
 	virtual ~Client(void);
 
-	void	answer(void);
+	void answer(void);
 
   private:
-	void	_getRequest(std::string);
+	void _getRequest(std::string);
 
 	int				   _fd;
 	struct sockaddr_in _client_addr;
@@ -38,5 +38,5 @@ class Client {
 	config::Server	  *_conf;
 };
 
-} // -namespace server
-} // -namespace webserv
+} // namespace server
+} // namespace webserv
diff --git a/includes/webserv.hpp b/includes/webserv.hpp
index f7f3865..1462958 100644
--- a/includes/webserv.hpp
+++ b/includes/webserv.hpp
@@ -6,12 +6,14 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/11 13:29:21 by mmoussou          #+#    #+#             */
-/*   Updated: 2025/04/22 12:43:26 by adjoly           ###   ########.fr       */
+/*   Updated: 2025/04/22 14:27:31 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #pragma once
 
+#define auto __auto_type
+
 #include <sys/types.h>
 #include <csignal>
 #include <cstdlib>
@@ -25,7 +27,7 @@
 #include <vector>
 #include <sstream>
 
-#define auto __auto_type
+
 #define range(x)                                                               \
 	x.begin();                                                                 \
 	it != x.end();                                                             \
diff --git a/src/config/Config.cpp b/src/config/Config.cpp
index 7ab3369..e461c8b 100644
--- a/src/config/Config.cpp
+++ b/src/config/Config.cpp
@@ -6,14 +6,14 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/04/14 12:53:54 by adjoly            #+#    #+#             */
-/*   Updated: 2025/04/22 11:11:26 by adjoly           ###   ########.fr       */
+/*   Updated: 2025/04/22 14:31:34 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "webserv.hpp"
 #include "cppeleven.hpp"
 #include "node/ANode.hpp"
 #include <config/default.hpp>
-#include <webserv.hpp>
 
 using namespace webserv::config;
 
diff --git a/src/config/Server.cpp b/src/config/Server.cpp
index 5dcc2e9..9290d80 100644
--- a/src/config/Server.cpp
+++ b/src/config/Server.cpp
@@ -6,10 +6,11 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/03/24 15:10:07 by adjoly            #+#    #+#             */
-/*   Updated: 2025/04/22 12:38:59 by adjoly           ###   ########.fr       */
+/*   Updated: 2025/04/22 14:26:00 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include <webserv.hpp>
 #include <config/default.hpp>
 
 using namespace webserv::config;
@@ -106,3 +107,21 @@ Server::_parseErrPages(std::map<std::string, toml::ANode *> *table) {
 	}
 	return errPages;
 }
+
+bool Server::isServerName(const std::string &server_name) {
+	for (auto it = prange(_server_names)) {
+		if (*it == server_name) {
+			return true;
+		}
+	}
+	return false;
+}
+
+Route *Server::whatRoute(const URL &url) {
+	for (auto it = prange(_routes)) {
+		if (it->first == url) {
+			return it->second;
+		}
+	}
+	return not_nullptr;
+}