diff --git a/spec/common_exception_handler_spec.cr b/spec/exception_handler_spec.cr
similarity index 100%
rename from spec/common_exception_handler_spec.cr
rename to spec/exception_handler_spec.cr
diff --git a/spec/common_log_handler_spec.cr b/spec/log_handler_spec.cr
similarity index 100%
rename from spec/common_log_handler_spec.cr
rename to spec/log_handler_spec.cr
diff --git a/src/kemal/handler.cr b/src/kemal/handler.cr
index 069c64d..0910eca 100644
--- a/src/kemal/handler.cr
+++ b/src/kemal/handler.cr
@@ -2,7 +2,7 @@ module Kemal
   # `Kemal::Handler` is a subclass of `HTTP::Handler`.
   #
   # It adds `only`, `only_match?`, `exclude`, `exclude_match?`.
-  # These methods are useful for custom handlers for conditional execution.
+  # These methods are useful for the conditional execution of custom handlers .
   class Handler
     include HTTP::Handler
     @@only_routes_tree = Radix::Tree(String).new
diff --git a/src/kemal/route_handler.cr b/src/kemal/route_handler.cr
index 686f50e..8804911 100644
--- a/src/kemal/route_handler.cr
+++ b/src/kemal/route_handler.cr
@@ -1,8 +1,6 @@
 require "radix"
 
 module Kemal
-  # Main handler which handles all the HTTP requests.
-  # Routing, parsing, rendering e.g are done in this handler.
   class RouteHandler
     include HTTP::Handler
     INSTANCE = new
diff --git a/src/kemal/websocket_handler.cr b/src/kemal/websocket_handler.cr
index 6d5d880..e2fe609 100644
--- a/src/kemal/websocket_handler.cr
+++ b/src/kemal/websocket_handler.cr
@@ -1,6 +1,4 @@
 module Kemal
-  # Used for building a WebSocket route.
-  # For each WebSocket route a new handler is created and registered to global handlers.
   class WebSocketHandler
     include HTTP::Handler
     INSTANCE = new