diff --git a/src/main/java/context/HandlerContext.java b/src/main/java/context/HandlerContext.java
index 2fe0958..1b6d797 100644
--- a/src/main/java/context/HandlerContext.java
+++ b/src/main/java/context/HandlerContext.java
@@ -54,9 +54,8 @@ public void setChannel(SocketChannel channel) {
      * 添加Handler，用于HandlerInitializer，对HandlerContext的添加并不会影响HandlerChain.
      *
      * @param handler {@link Handler}
-     * @return this {@link HandlerContext}
      */
-    public HandlerContext addHandler(Handler handler) {
+    public void addHandler(Handler handler) {
         if (handler instanceof InBoundHandler) {
             inBoundHandlers.add((InBoundHandler) handler);
             ++inBoundSize;
@@ -64,7 +63,6 @@ public HandlerContext addHandler(Handler handler) {
             outBoundHandlers.add((OutBoundHandler) handler);
             ++outBoundSize;
         }
-        return this;
     }
 
     /**
@@ -128,9 +126,9 @@ public void fireChannelRead(Object message) {
     public void fireChannelReads(List<byte[]> messages) {
         if (messages != null) {
             int oldIndex = index;
-            for (int i = 0, s = messages.size(); i < s; i++) {
+            for (byte[] message : messages) {
                 index = oldIndex;
-                fireChannelRead(messages.get(i));
+                fireChannelRead(message);
             }
         }
     }
diff --git a/src/main/java/handler/HandlerInitializer.java b/src/main/java/handler/HandlerInitializer.java
index 58d7b6b..5471055 100644
--- a/src/main/java/handler/HandlerInitializer.java
+++ b/src/main/java/handler/HandlerInitializer.java
@@ -18,8 +18,8 @@ public void channelActive(HandlerContext context) {
         Handler[] handlers = init();
         Objects.requireNonNull(handlers);
         context.removeHandlerInitializer(this);
-        for (int i = 0, l = handlers.length; i < l; i++) {
-            context.addHandler(handlers[i]);
+        for (Handler handler : handlers) {
+            context.addHandler(handler);
         }
         context.fireChannelActive();
     }
diff --git a/src/main/java/selector/QueuedSelector.java b/src/main/java/selector/QueuedSelector.java
index ca0e42b..e6d0a0d 100644
--- a/src/main/java/selector/QueuedSelector.java
+++ b/src/main/java/selector/QueuedSelector.java
@@ -149,7 +149,9 @@ public void run() {
                 HandlerChain handlerChain = selectorManager.getHandlerChain();
                 HandlerContext context = new HandlerContext(
                         handlerChain.getInBoundHandlers(),
-                        handlerChain.getOutBoundHandlers(), true);
+                        handlerChain.getOutBoundHandlers(),
+                        true
+                );
                 context.setChannel(channel);
                 context.setWorkerManager(workerManager);
                 key.attach(context);
@@ -207,8 +209,11 @@ private HandlerContext checkAttachment(Object attachment, SocketChannel channel)
             HandlerContext context;
             if (attachment == null) {
                 HandlerChain handlerChain = selectorManager.getHandlerChain();
-                context = new HandlerContext(handlerChain.getInBoundHandlers(),
-                        handlerChain.getOutBoundHandlers(), true);
+                context = new HandlerContext(
+                        handlerChain.getInBoundHandlers(),
+                        handlerChain.getOutBoundHandlers(),
+                        true
+                );
                 context.setChannel(channel);
                 context.setWorkerManager(workerManager);
             } else {