diff --git a/src/main/java/org/lumijiez/core/http/HttpStatus.java b/src/main/java/org/lumijiez/core/http/HttpStatus.java
index df913de..a9e3e0e 100644
--- a/src/main/java/org/lumijiez/core/http/HttpStatus.java
+++ b/src/main/java/org/lumijiez/core/http/HttpStatus.java
@@ -1,13 +1,59 @@
 package org.lumijiez.core.http;
 
 public enum HttpStatus {
+    // 1xx Informational
+    CONTINUE(100, "Continue"),
+    SWITCHING_PROTOCOLS(101, "Switching Protocols"),
+    PROCESSING(102, "Processing"),
+
+    // 2xx Success
     OK(200, "OK"),
     CREATED(201, "Created"),
+    ACCEPTED(202, "Accepted"),
+    NON_AUTHORITATIVE_INFORMATION(203, "Non-Authoritative Information"),
     NO_CONTENT(204, "No Content"),
+    RESET_CONTENT(205, "Reset Content"),
+    PARTIAL_CONTENT(206, "Partial Content"),
+
+    // 3xx Redirection
+    MULTIPLE_CHOICES(300, "Multiple Choices"),
+    MOVED_PERMANENTLY(301, "Moved Permanently"),
+    FOUND(302, "Found"),
+    SEE_OTHER(303, "See Other"),
+    NOT_MODIFIED(304, "Not Modified"),
+    TEMPORARY_REDIRECT(307, "Temporary Redirect"),
+    PERMANENT_REDIRECT(308, "Permanent Redirect"),
+
+    // 4xx Client Errors
     BAD_REQUEST(400, "Bad Request"),
+    UNAUTHORIZED(401, "Unauthorized"),
+    PAYMENT_REQUIRED(402, "Payment Required"),
+    FORBIDDEN(403, "Forbidden"),
     NOT_FOUND(404, "Not Found"),
     METHOD_NOT_ALLOWED(405, "Method Not Allowed"),
-    INTERNAL_SERVER_ERROR(500, "Internal Server Error");
+    NOT_ACCEPTABLE(406, "Not Acceptable"),
+    PROXY_AUTHENTICATION_REQUIRED(407, "Proxy Authentication Required"),
+    REQUEST_TIMEOUT(408, "Request Timeout"),
+    CONFLICT(409, "Conflict"),
+    GONE(410, "Gone"),
+    LENGTH_REQUIRED(411, "Length Required"),
+    PRECONDITION_FAILED(412, "Precondition Failed"),
+    PAYLOAD_TOO_LARGE(413, "Payload Too Large"),
+    URI_TOO_LONG(414, "URI Too Long"),
+    UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"),
+    RANGE_NOT_SATISFIABLE(416, "Range Not Satisfiable"),
+    EXPECTATION_FAILED(417, "Expectation Failed"),
+    I_AM_A_TEAPOT(418, "I'm a teapot"),
+    TOO_MANY_REQUESTS(429, "Too Many Requests"),
+
+    // 5xx Server Errors
+    INTERNAL_SERVER_ERROR(500, "Internal Server Error"),
+    NOT_IMPLEMENTED(501, "Not Implemented"),
+    BAD_GATEWAY(502, "Bad Gateway"),
+    SERVICE_UNAVAILABLE(503, "Service Unavailable"),
+    GATEWAY_TIMEOUT(504, "Gateway Timeout"),
+    HTTP_VERSION_NOT_SUPPORTED(505, "HTTP Version Not Supported");
+
 
     private final int code;
     private final String message;
diff --git a/src/main/java/org/lumijiez/core/middleware/Middleware.java b/src/main/java/org/lumijiez/core/middleware/Middleware.java
index c1b54fd..e522438 100644
--- a/src/main/java/org/lumijiez/core/middleware/Middleware.java
+++ b/src/main/java/org/lumijiez/core/middleware/Middleware.java
@@ -1,6 +1,5 @@
 package org.lumijiez.core.middleware;
 
-import com.sun.net.httpserver.Filter;
 import org.lumijiez.core.http.HttpRequest;
 import org.lumijiez.core.http.HttpResponse;
 
diff --git a/src/main/java/org/lumijiez/core/routing/Router.java b/src/main/java/org/lumijiez/core/routing/Router.java
index 5de8f19..ea8e25d 100644
--- a/src/main/java/org/lumijiez/core/routing/Router.java
+++ b/src/main/java/org/lumijiez/core/routing/Router.java
@@ -24,7 +24,6 @@ public class Router {
     }
 
     public void handleRequest(HttpRequest request, HttpResponse response) throws IOException {
-        // Create middleware chain
         Chain chain = new Chain() {
             private int index = 0;
 
@@ -38,7 +37,6 @@ public class Router {
             }
         };
 
-        // Start middleware chain
         chain.next(request, response);
     }