diff --git a/Makefile b/Makefile
index 9c331ce..e95ff04 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-x# **************************************************************************** #
+# **************************************************************************** #
 #                                                                              #
 #                                                         :::      ::::::::    #
 #    Makefile                                           :+:      :+:    :+:    #
@@ -6,7 +6,7 @@ x# ****************************************************************************
 #    By: sben-tay <sben-tay@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2025/05/02 15:40:00 by rparodi           #+#    #+#              #
-#    Updated: 2025/05/20 17:06:30 by sben-tay         ###   ########.fr        #
+#    Updated: 2025/05/20 17:19:13 by sben-tay         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -28,7 +28,7 @@ SRC =	sources/core/main.cpp \
 		sources/core/Server.cpp \
 		sources/core/check.cpp \
 		sources/core/parser.cpp \
-		sources/core/PollManager.cpp \
+		sources/core/PollManager.cpp
 
 
 INC_DIR = include/core \
diff --git a/include/core/PollManager.hpp b/include/core/PollManager.hpp
index 8939e02..008f843 100644
--- a/include/core/PollManager.hpp
+++ b/include/core/PollManager.hpp
@@ -1,3 +1,15 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   PollManager.hpp                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: sben-tay <sben-tay@student.42.fr>          +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2025/05/19 19:15:13 by omoudni           #+#    #+#             */
+/*   Updated: 2025/05/20 17:22:59 by sben-tay         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #pragma once
 
 #include <map>
diff --git a/include/core/core.hpp b/include/core/core.hpp
index 3691a10..a50d333 100644
--- a/include/core/core.hpp
+++ b/include/core/core.hpp
@@ -1,14 +1,14 @@
-/******************************************************************************/
+/* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
 /*   core.hpp                                           :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: omoudni <omoudni@student.42paris.fr>       +#+  +:+       +#+        */
+/*   By: sben-tay <sben-tay@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/05/12 14:16:03 by rparodi           #+#    #+#             */
-/*   Updated: 2025/05/19 20:15:14 by omoudni          ###   ########.fr       */
+/*   Updated: 2025/05/20 17:23:41 by sben-tay         ###   ########.fr       */
 /*                                                                            */
-/******************************************************************************/
+/* ************************************************************************** */
 
 #pragma once
 
@@ -30,7 +30,7 @@ enum e_state {
     };
     
 
-#include "pollManager.hpp"
+#include "PollManager.hpp"
 #include "color.hpp"
 #include "server.hpp"
 #include "parser.hpp"
diff --git a/include/core/pollManager.hpp b/include/core/pollManager.hpp
deleted file mode 100644
index d7a0770..0000000
--- a/include/core/pollManager.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   pollManager.hpp                                    :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: omoudni <omoudni@student.42paris.fr>       +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/05/19 19:15:13 by omoudni           #+#    #+#             */
-/*   Updated: 2025/05/19 19:25:45 by omoudni          ###   ########.fr       */
-/*                                                                            */
-/******************************************************************************/
-
-#pragma once
-#include <vector>
-#include <poll.h>
-#include <map>
-
-class PollManager {
-private:
-    std::vector<struct pollfd> _fds;
-    std::map<int, short> _fd_events; // fd -> event
-
-public:
-    PollManager();
-    void addFd(int fd, short events);
-    void removeFd(int fd);
-    void updateFd(int fd, short events);
-    int pollEvents(int timeout = -1);
-    const std::vector<struct pollfd>& getFds() const;
-};
\ No newline at end of file
diff --git a/sources/core/PollManager.cpp b/sources/core/PollManager.cpp
index 5331876..29d8485 100644
--- a/sources/core/PollManager.cpp
+++ b/sources/core/PollManager.cpp
@@ -1,4 +1,5 @@
 #include "PollManager.hpp"
+
 #include <iostream>
 #include <unistd.h>
 #include <cstring>
diff --git a/sources/core/pollManager.cpp b/sources/core/pollManager.cpp
deleted file mode 100644
index a02bff2..0000000
--- a/sources/core/pollManager.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   pollManager.cpp                                    :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: omoudni <omoudni@student.42paris.fr>       +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/05/19 19:15:48 by omoudni           #+#    #+#             */
-/*   Updated: 2025/05/19 20:21:11 by omoudni          ###   ########.fr       */
-/*                                                                            */
-/******************************************************************************/
-
-#include "pollManager.hpp"
-#include <algorithm>
-
-PollManager::PollManager() {}
-
-void PollManager::addFd(int fd, short events) {
-    struct pollfd pfd = {fd, events, 0};
-    _fds.push_back(pfd);
-    _fd_events[fd] = events;
-}
-
-void PollManager::removeFd(int fd) {
-    for (std::vector<struct pollfd>::iterator it = _fds.begin(); it != _fds.end(); ) {
-        if (it->fd == fd)
-            it = _fds.erase(it);
-        else
-            ++it;
-    }
-    _fd_events.erase(fd);
-}
-
-void PollManager::updateFd(int fd, short events) {
-    for (size_t i = 0; i < _fds.size(); ++i) {
-        if (_fds[i].fd == fd) {
-            _fds[i].events = events;
-            break;
-        }
-    }
-    _fd_events[fd] = events;
-}
-
-int PollManager::pollEvents(int timeout) {
-    return poll(_fds.data(), _fds.size(), timeout);
-}
-
-const std::vector<struct pollfd>& PollManager::getFds() const {
-    return _fds;
-}
\ No newline at end of file