diff --git a/broker/src/main/java/io/moquette/server/Server.java b/broker/src/main/java/io/moquette/server/Server.java
index dbddee0e..9253eab6 100644
--- a/broker/src/main/java/io/moquette/server/Server.java
+++ b/broker/src/main/java/io/moquette/server/Server.java
@@ -27,7 +27,6 @@ import io.moquette.spi.impl.ProtocolProcessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
diff --git a/broker/src/main/java/io/moquette/server/netty/MoquetteIdleTimoutHandler.java b/broker/src/main/java/io/moquette/server/netty/MoquetteIdleTimeoutHandler.java
similarity index 95%
rename from broker/src/main/java/io/moquette/server/netty/MoquetteIdleTimoutHandler.java
rename to broker/src/main/java/io/moquette/server/netty/MoquetteIdleTimeoutHandler.java
index 1e80a141..541fa3cf 100644
--- a/broker/src/main/java/io/moquette/server/netty/MoquetteIdleTimoutHandler.java
+++ b/broker/src/main/java/io/moquette/server/netty/MoquetteIdleTimeoutHandler.java
@@ -22,7 +22,7 @@ import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
 
 @Sharable
-class MoquetteIdleTimoutHandler extends ChannelDuplexHandler {
+class MoquetteIdleTimeoutHandler extends ChannelDuplexHandler {
     @Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
         if (evt instanceof IdleStateEvent) {
diff --git a/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java
index abc3870b..e3ab6e94 100644
--- a/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java
+++ b/broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java
@@ -145,7 +145,7 @@ public class NettyAcceptor implements ServerAcceptor {
     }
     
     private void initializePlainTCPTransport(final NettyMQTTHandler handler, IConfig props) throws IOException {
-        final MoquetteIdleTimoutHandler timeoutHandler = new MoquetteIdleTimoutHandler();
+        final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler();
         String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME);
         int port = Integer.parseInt(props.getProperty(BrokerConstants.PORT_PROPERTY_NAME));
         initFactory(host, port, new PipelineInitializer() {
@@ -172,7 +172,7 @@ public class NettyAcceptor implements ServerAcceptor {
         }
         int port = Integer.parseInt(webSocketPortProp);
         
-        final MoquetteIdleTimoutHandler timeoutHandler = new MoquetteIdleTimoutHandler();
+        final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler();
 
         String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME);
         initFactory(host, port, new PipelineInitializer() {
@@ -206,7 +206,7 @@ public class NettyAcceptor implements ServerAcceptor {
         int sslPort = Integer.parseInt(sslPortProp);
         LOG.info("Starting SSL on port {}", sslPort);
 
-        final MoquetteIdleTimoutHandler timeoutHandler = new MoquetteIdleTimoutHandler();
+        final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler();
         String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME);
         initFactory(host, sslPort, new PipelineInitializer() {
             @Override
@@ -232,7 +232,7 @@ public class NettyAcceptor implements ServerAcceptor {
             return;
         }
         int sslPort = Integer.parseInt(sslPortProp);
-        final MoquetteIdleTimoutHandler timeoutHandler = new MoquetteIdleTimoutHandler();
+        final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler();
         String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME);
         initFactory(host, sslPort, new PipelineInitializer() {
             @Override
diff --git a/broker/src/main/java/io/moquette/server/netty/NettyUtils.java b/broker/src/main/java/io/moquette/server/netty/NettyUtils.java
index 58ae4f71..8ce3e341 100644
--- a/broker/src/main/java/io/moquette/server/netty/NettyUtils.java
+++ b/broker/src/main/java/io/moquette/server/netty/NettyUtils.java
@@ -45,6 +45,6 @@ public class NettyUtils {
             channel.pipeline().remove("idleEventHandler");
         }
         channel.pipeline().addFirst("idleStateHandler", new IdleStateHandler(0, 0, idleTime));
-        channel.pipeline().addAfter("idleStateHandler", "idleEventHandler", new MoquetteIdleTimoutHandler());
+        channel.pipeline().addAfter("idleStateHandler", "idleEventHandler", new MoquetteIdleTimeoutHandler());
     }
 }