diff --git a/Account/AccountManager.js b/Account/AccountManager.js
index 30d288e..5510fa0 100755
--- a/Account/AccountManager.js
+++ b/Account/AccountManager.js
@@ -1,4 +1,6 @@
-import { Account } from './Account.js';
+/**
+ * @typedef {import('./Account.js').Account} Account
+ */
 
 /**
  * Account Manager.
diff --git a/Auth/Auth.js b/Auth/Auth.js
index 3e8e9c6..c05b0e4 100755
--- a/Auth/Auth.js
+++ b/Auth/Auth.js
@@ -1,8 +1,11 @@
-import { Account }       from '../Account/Account.js';
 import { Request }       from '../Message/Request/Request.js';
 import { RequestMethod } from '../Message/Request/RequestMethod.js';
 import { RequestType }   from '../Message/Request/RequestType.js';
 
+/**
+ * @typedef {import('../Account/Account.js').Account} Account
+ */
+
 /**
  * Auth class.
  *
diff --git a/DataStorage/CacheManager.js b/DataStorage/CacheManager.js
index 08147cc..dd2aa74 100755
--- a/DataStorage/CacheManager.js
+++ b/DataStorage/CacheManager.js
@@ -1,7 +1,3 @@
 export class CacheManager
 {
-    constructor ()
-    {
-
-    }
 };
diff --git a/DataStorage/LocalStorage.js b/DataStorage/LocalStorage.js
index 1b85415..c32bc28 100755
--- a/DataStorage/LocalStorage.js
+++ b/DataStorage/LocalStorage.js
@@ -8,15 +8,6 @@
  */
 export class LocalStorage
 {
-    /**
-     * @constructor
-     *
-     * @since 1.0.0
-     */
-    constructor ()
-    {
-    };
-
     /**
      * Is local storage available?
      *
diff --git a/DataStorage/StorageManager.js b/DataStorage/StorageManager.js
index c42d583..dc80b03 100755
--- a/DataStorage/StorageManager.js
+++ b/DataStorage/StorageManager.js
@@ -1,6 +1,3 @@
 export class StorageManager
 {
-    constructor ()
-    {
-    };
 };
diff --git a/Message/Notification/App/AppNotification.js b/Message/Notification/App/AppNotification.js
index 6bf11aa..9caad97 100755
--- a/Message/Notification/App/AppNotification.js
+++ b/Message/Notification/App/AppNotification.js
@@ -1,4 +1,6 @@
-import { NotificationMessage } from '../NotificationMessage.js';
+/**
+ * @typedef {import('../NotificationMessage.js').NotificationMessage} NotificationMessage
+ */
 
 /**
  * App notification.
diff --git a/Message/Notification/Browser/BrowserNotification.js b/Message/Notification/Browser/BrowserNotification.js
index b3a5a6b..427b3bd 100755
--- a/Message/Notification/Browser/BrowserNotification.js
+++ b/Message/Notification/Browser/BrowserNotification.js
@@ -1,4 +1,6 @@
-import { NotificationMessage } from '../NotificationMessage.js';
+/**
+ * @typedef {import('../NotificationMessage.js').NotificationMessage} NotificationMessage
+ */
 
 /**
  * Browser notification.
diff --git a/Message/Response/ResponseManager.js b/Message/Response/ResponseManager.js
index a4389a1..08ce10c 100755
--- a/Message/Response/ResponseManager.js
+++ b/Message/Response/ResponseManager.js
@@ -1,4 +1,6 @@
-import { Request } from '../Request/Request.js';
+/**
+ * @typedef {import('../Request/Request.js').Request} Request
+ */
 
 /**
  * Response manager class.
diff --git a/Module/ModuleFactory.js b/Module/ModuleFactory.js
index 4af1e1a..2590fd0 100755
--- a/Module/ModuleFactory.js
+++ b/Module/ModuleFactory.js
@@ -8,15 +8,6 @@
  */
 export class ModuleFactory
 {
-    /**
-     * @constructor
-     *
-     * @since 1.0.0
-     */
-    constructor ()
-    {
-    };
-
     /**
      * Get module instance.
      *
diff --git a/Socket/Client/Client.js b/Socket/Client/Client.js
index f51eecf..08bcfd4 100755
--- a/Socket/Client/Client.js
+++ b/Socket/Client/Client.js
@@ -26,11 +26,11 @@
     };
 
     jsOMS.Client.prototype.connect = function () {
-        var self        = this;
+        const self      = this;
         this.connection = new WebSocket(this.ip, this.protocol);
 
         this.connection.onmessage = function (event) {
-            var msg = JSON.parse(event.data);
+            const msg = JSON.parse(event.data);
 
             self.messages[msg.type](msg);
         };
diff --git a/UI/Component/AdvancedInput.js b/UI/Component/AdvancedInput.js
index 7277980..1f27242 100755
--- a/UI/Component/AdvancedInput.js
+++ b/UI/Component/AdvancedInput.js
@@ -1,5 +1,8 @@
 import { Request } from '../../Message/Request/Request.js';
-import { EventManager } from '../../Event/EventManager.js';
+
+/**
+ * @typedef {import('../../Event/EventManager.js').EventManager} EventManager
+ */
 
 /**
  * Advanced input class.
diff --git a/UI/Component/Tab.js b/UI/Component/Tab.js
index d0e519a..828bec5 100755
--- a/UI/Component/Tab.js
+++ b/UI/Component/Tab.js
@@ -89,9 +89,9 @@ export class Tab
                 }
 
                 const fragments = fragmentString.split('&');
-                const index     = fragments.indexOf(this.getElementsByTagName('label')[0].getAttribute('for'));
 
                 /**
+                const index = fragments.indexOf(this.getElementsByTagName('label')[0].getAttribute('for'));
                 if (index > -1) {
                     fragments.splice(index, 1);
                 } */
diff --git a/UI/RemoteData.js b/UI/RemoteData.js
index f14d2ae..8d67bf8 100755
--- a/UI/RemoteData.js
+++ b/UI/RemoteData.js
@@ -1,7 +1,6 @@
 import { Request }             from '../Message/Request/Request.js';
 import { RequestMethod }       from '../Message/Request/RequestMethod.js';
 import { RequestType }         from '../Message/Request/RequestType.js';
-import { Response }            from '../Message/Response/Response.js';
 import { GeneralUI }           from './GeneralUI.js';
 
 /**
diff --git a/Utils/oLib.js b/Utils/oLib.js
index b0cb22c..000a92a 100755
--- a/Utils/oLib.js
+++ b/Utils/oLib.js
@@ -306,11 +306,11 @@
      */
     jsOMS.watcher = (function ()
     {
-        var timer = 0;
+        let watcherTimer = 0;
         return function (callback, ms)
         {
-            clearTimeout(timer);
-            timer = setTimeout(callback, ms);
+            clearTimeout(watcherTimer);
+            watcherTimer = setTimeout(callback, ms);
         };
     })();