diff --git a/src/index.js b/src/index.js
index c7bd2b0..403fbdb 100644
--- a/src/index.js
+++ b/src/index.js
@@ -19,29 +19,17 @@ function createMCServer(options) {
   return mcServer;
 }
 
-function MCServer() {
-  EventEmitter.call(this);
-  this._server = null;
-}
-util.inherits(MCServer, EventEmitter);
-
-MCServer.prototype.connect = function(options) {
-  var self = this;
-  self._server = mc.createServer(options);
-
-  for(var pluginName in serverPlugins) {
-    serverPlugins[pluginName](self, options);
+class MCServer extends EventEmitter {
+  constructor() {
+    super();
+    this._server = null;
   }
 
-  if(options.logging == true) {
-    self.createLog();
+  connect(options) {
+    this._server = mc.createServer(options);
+    Object.keys(serverPlugins).forEach(pluginName => serverPlugins[pluginName](this, options));
+    if(options.logging == true) this.createLog();
+    this._server.on('error', error => this.emit('error',error));
+    this._server.on('listening', () => this.emit('listening',this._server.socketServer.address().port));
   }
-
-  self._server.on('error', function(error) {
-    self.emit('error',error);
-  });
-
-  self._server.on('listening', function() {
-    self.emit('listening',self._server.socketServer.address().port);
-  });
-};
+}
\ No newline at end of file