diff --git a/src/main/java/org/java_websocket/AbstractWebSocket.java b/src/main/java/org/java_websocket/AbstractWebSocket.java
index 63947b16..d39c898e 100644
--- a/src/main/java/org/java_websocket/AbstractWebSocket.java
+++ b/src/main/java/org/java_websocket/AbstractWebSocket.java
@@ -48,7 +48,7 @@ public abstract class AbstractWebSocket extends WebSocketAdapter {
 	 *
 	 * @since 1.4.0
 	 */
-	private static final Logger log = LoggerFactory.getLogger(AbstractWebSocket.class);
+	private final Logger log = LoggerFactory.getLogger(AbstractWebSocket.class);
 
     /**
      * Attribute which allows you to deactivate the Nagle's algorithm
diff --git a/src/main/java/org/java_websocket/SSLSocketChannel.java b/src/main/java/org/java_websocket/SSLSocketChannel.java
index feeeaaa0..ed8a797d 100644
--- a/src/main/java/org/java_websocket/SSLSocketChannel.java
+++ b/src/main/java/org/java_websocket/SSLSocketChannel.java
@@ -70,10 +70,10 @@ public class SSLSocketChannel implements WrappedByteChannel, ByteChannel, ISSLCh
 	 *
 	 * @since 1.4.0
 	 */
-	private static final Logger log = LoggerFactory.getLogger(SSLSocketChannel.class);
+	private final Logger log = LoggerFactory.getLogger(SSLSocketChannel.class);
 
 	/**
-	 * The underlaying socket channel
+	 * The underlying socket channel
 	 */
 	private final SocketChannel socketChannel;
 
diff --git a/src/main/java/org/java_websocket/SSLSocketChannel2.java b/src/main/java/org/java_websocket/SSLSocketChannel2.java
index 07df1364..e2fb0acc 100644
--- a/src/main/java/org/java_websocket/SSLSocketChannel2.java
+++ b/src/main/java/org/java_websocket/SSLSocketChannel2.java
@@ -55,17 +55,17 @@
  */
 public class SSLSocketChannel2 implements ByteChannel, WrappedByteChannel, ISSLChannel {
 
+    /**
+     * This object is used to feed the {@link SSLEngine}'s wrap and unwrap methods during the handshake phase.
+     **/
+    protected static ByteBuffer emptybuffer = ByteBuffer.allocate( 0 );
+
     /**
      * Logger instance
      *
      * @since 1.4.0
      */
-    private static final Logger log = LoggerFactory.getLogger(SSLSocketChannel2.class);
-
-    /**
-     * This object is used to feed the {@link SSLEngine}'s wrap and unwrap methods during the handshake phase.
-     **/
-    protected static ByteBuffer emptybuffer = ByteBuffer.allocate( 0 );
+    private final Logger log = LoggerFactory.getLogger(SSLSocketChannel2.class);
 
     protected ExecutorService exec;
 
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/main/java/org/java_websocket/WebSocketImpl.java
index c4b56e6f..cb7644fa 100644
--- a/src/main/java/org/java_websocket/WebSocketImpl.java
+++ b/src/main/java/org/java_websocket/WebSocketImpl.java
@@ -85,7 +85,7 @@ public class WebSocketImpl implements WebSocket {
 	 *
 	 * @since 1.4.0
 	 */
-	private static final Logger log = LoggerFactory.getLogger(WebSocketImpl.class);
+	private final Logger log = LoggerFactory.getLogger(WebSocketImpl.class);
 
 	/**
 	 * Queue of buffers that need to be sent to the client.
diff --git a/src/main/java/org/java_websocket/drafts/Draft_6455.java b/src/main/java/org/java_websocket/drafts/Draft_6455.java
index 335e5cf8..f80172bf 100644
--- a/src/main/java/org/java_websocket/drafts/Draft_6455.java
+++ b/src/main/java/org/java_websocket/drafts/Draft_6455.java
@@ -86,7 +86,7 @@ public class Draft_6455 extends Draft {
 	 *
 	 * @since 1.4.0
 	 */
-	private static final Logger log = LoggerFactory.getLogger(Draft_6455.class);
+	private final Logger log = LoggerFactory.getLogger(Draft_6455.class);
 
 	/**
 	 * Attribute for the used extension in this draft
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
index a8d8e346..be346bf9 100644
--- a/src/main/java/org/java_websocket/server/WebSocketServer.java
+++ b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -46,13 +46,11 @@
 
 import org.java_websocket.*;
 import org.java_websocket.drafts.Draft;
-import org.java_websocket.exceptions.InvalidDataException;
 import org.java_websocket.exceptions.WebsocketNotConnectedException;
 import org.java_websocket.framing.CloseFrame;
 import org.java_websocket.framing.Framedata;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.handshake.Handshakedata;
-import org.java_websocket.handshake.ServerHandshakeBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -64,14 +62,14 @@
  */
 public abstract class WebSocketServer extends AbstractWebSocket implements Runnable {
 
+	private static final int AVAILABLE_PROCESSORS = Runtime.getRuntime().availableProcessors();
+
 	/**
 	 * Logger instance
 	 *
 	 * @since 1.4.0
 	 */
-	private static final Logger log = LoggerFactory.getLogger(WebSocketServer.class);
-
-	private static final int AVAILABLE_PROCESSORS = Runtime.getRuntime().availableProcessors();
+	private final Logger log = LoggerFactory.getLogger(WebSocketServer.class);
 
 	/**
 	 * Holds the list of active WebSocket connections. "Active" means WebSocket