diff --git a/samples/dash-if-reference-player/app/main.js b/samples/dash-if-reference-player/app/main.js
index 7037ec8b89..750d5bdf9f 100644
--- a/samples/dash-if-reference-player/app/main.js
+++ b/samples/dash-if-reference-player/app/main.js
@@ -1,12 +1,12 @@
 'use strict';
 
-var app = angular.module('DashPlayer', ['DashSourcesService', 'DashContributorsService', 'DashIFTestVectorsService', 'angular-flot']); /* jshint ignore:line */
+var app = angular.module('DashPlayer', ['DashSourcesService', 'DashContributorsService', 'DashIFTestVectorsService', 'angular-flot']);
 
 $(document).ready(function () {
     $('[data-toggle="tooltip"]').tooltip();
 });
 
-angular.module('DashSourcesService', ['ngResource']).factory('sources', function ($resource) { /* jshint ignore:line */
+angular.module('DashSourcesService', ['ngResource']).factory('sources', function ($resource) {
     return $resource('app/sources.json', {}, {
         query: {
             method: 'GET',
@@ -15,7 +15,7 @@ angular.module('DashSourcesService', ['ngResource']).factory('sources', function
     });
 });
 
-angular.module('DashContributorsService', ['ngResource']).factory('contributors', function ($resource) { /* jshint ignore:line */
+angular.module('DashContributorsService', ['ngResource']).factory('contributors', function ($resource) {
     return $resource('app/contributors.json', {}, {
         query: {
             method: 'GET',
@@ -24,7 +24,7 @@ angular.module('DashContributorsService', ['ngResource']).factory('contributors'
     });
 });
 
-angular.module('DashIFTestVectorsService', ['ngResource']).factory('dashifTestVectors', function ($resource) { /* jshint ignore:line */
+angular.module('DashIFTestVectorsService', ['ngResource']).factory('dashifTestVectors', function ($resource) {
     return $resource('https://testassets.dashif.org/dashjs.json', {}, {
         query: {
             method: 'GET',
@@ -41,7 +41,7 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
     sources.query(function (data) {
         $scope.availableStreams = data.items;
         // if no mss package, remove mss samples.
-        var MssHandler = dashjs.MssHandler; /* jshint ignore:line */
+        var MssHandler = dashjs.MssHandler;
         if (typeof MssHandler !== 'function') {
             for (var i = $scope.availableStreams.length - 1; i >= 0; i--) {
                 if ($scope.availableStreams[i].name === 'Smooth Streaming') {
@@ -346,11 +346,11 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
 
     $scope.video = document.querySelector('.dash-video-player video');
     // store a ref in window.player to provide an easy way to play with dash.js API
-    window.player = $scope.player = dashjs.MediaPlayer().create(); /* jshint ignore:line */
+    window.player = $scope.player = dashjs.MediaPlayer().create();
 
     const defaultSettings = JSON.parse(JSON.stringify($scope.player.getSettings()));
 
-    $scope.player.on(dashjs.MediaPlayer.events.ERROR, function (e) { /* jshint ignore:line */
+    $scope.player.on(dashjs.MediaPlayer.events.ERROR, function (e) {
         console.log(e);
         if (!e.event) {
             $scope.$apply(function () {
@@ -415,12 +415,12 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         document.getElementById('never-replace-audio').checked = true;
     }
 
-    $scope.controlbar = new ControlBar($scope.player); /* jshint ignore:line */
+    $scope.controlbar = new ControlBar($scope.player);
     $scope.controlbar.initialize();
     $scope.controlbar.disable();
     $scope.version = $scope.player.getVersion();
 
-    $scope.player.on(dashjs.MediaPlayer.events.MANIFEST_LOADED, function (e) { /* jshint ignore:line */
+    $scope.player.on(dashjs.MediaPlayer.events.MANIFEST_LOADED, function (e) {
         $scope.isDynamic = e.data.type === 'dynamic';
     }, $scope);
 
@@ -438,17 +438,17 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
     }, $scope);
 
 
-    $scope.player.on(dashjs.MediaPlayer.events.PERIOD_SWITCH_COMPLETED, function (e) { /* jshint ignore:line */
+    $scope.player.on(dashjs.MediaPlayer.events.PERIOD_SWITCH_COMPLETED, function (e) {
         $scope.currentStreamInfo = e.toStreamInfo;
     }, $scope);
 
-    $scope.player.on(dashjs.MediaPlayer.events.QUALITY_CHANGE_RENDERED, function (e) { /* jshint ignore:line */
+    $scope.player.on(dashjs.MediaPlayer.events.QUALITY_CHANGE_RENDERED, function (e) {
         $scope[e.mediaType + 'Index'] = e.newRepresentation.absoluteIndex + 1;
         $scope.plotPoint('index', e.mediaType, e.newQuality + 1, getTimeForPlot());
         $scope.safeApply();
     }, $scope);
 
-    $scope.player.on(dashjs.MediaPlayer.events.STREAM_INITIALIZED, function (e) { /* jshint ignore:line */
+    $scope.player.on(dashjs.MediaPlayer.events.STREAM_INITIALIZED, function (e) {
         stopMetricsInterval();
         $scope.videoQualities = $scope.player.getRepresentationsByType('video');
         $scope.chartCount = 0;
@@ -459,20 +459,20 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         }, $scope.updateMetricsInterval);
     }, $scope);
 
-    $scope.player.on(dashjs.MediaPlayer.events.PLAYBACK_ENDED, function (e) { /* jshint ignore:line */
+    $scope.player.on(dashjs.MediaPlayer.events.PLAYBACK_ENDED, function (e) {
         if ($('#loop-cb').is(':checked') &&
             e && e.isLast) {
             $scope.doLoad();
         }
     }, $scope);
 
-    $scope.player.on(dashjs.MediaPlayer.events.KEY_SYSTEM_SELECTED, function (e) { /* jshint ignore:line */
+    $scope.player.on(dashjs.MediaPlayer.events.KEY_SYSTEM_SELECTED, function (e) {
         if (e.data) {
             $scope.selectedKeySystem = e.data.keySystem.systemString;
         }
     }, $scope);
 
-    $scope.player.on(dashjs.MediaPlayer.events.KEY_SESSION_CREATED, function (e) { /* jshint ignore:line */
+    $scope.player.on(dashjs.MediaPlayer.events.KEY_SESSION_CREATED, function (e) {
         if (e.data) {
             var session = e.data;
             if (session.getSessionType() === 'persistent-license') {
@@ -481,7 +481,7 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
         }
     }, $scope);
 
-    $scope.player.on(dashjs.MediaPlayer.events.CONFORMANCE_VIOLATION, function (e) { /* jshint ignore:line */
+    $scope.player.on(dashjs.MediaPlayer.events.CONFORMANCE_VIOLATION, function (e) {
         if (e && e.event && e.event.key && !$scope.conformanceViolations[e.event.key]) {
             var existingViolation = $scope.conformanceViolations.filter(function (violation) {
                 return violation.event.key === e.event.key;
@@ -1785,8 +1785,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
                     $scope.muted = this.parseBoolean(value);
                     $scope.toggleMuted();
                     if ($scope.muted === true){
-                        document.getElementById('muteBtn')?.click();    
-                    } 
+                        document.getElementById('muteBtn')?.click();
+                    }
                     break;
                 case 'drmToday':
                     $scope.drmToday = this.parseBoolean(value);
@@ -2457,8 +2457,8 @@ app.controller('DashController', ['$scope', '$window', 'sources', 'contributors'
     }
 }]);
 
-function legendLabelClickHandler(obj) { /* jshint ignore:line */
-    var scope = angular.element($('body')).scope(); /* jshint ignore:line */
+function legendLabelClickHandler(obj) {
+    var scope = angular.element($('body')).scope();
     var id = obj.id.split('.');
     var target = scope.chartState[id[0]][id[1]];
     target.selected = !target.selected;
diff --git a/src/mss/MssFragmentInfoController.js b/src/mss/MssFragmentInfoController.js
index dfdd813779..6ebe1039cd 100644
--- a/src/mss/MssFragmentInfoController.js
+++ b/src/mss/MssFragmentInfoController.js
@@ -208,4 +208,4 @@ function MssFragmentInfoController(config) {
 }
 
 MssFragmentInfoController.__dashjs_factory_name = 'MssFragmentInfoController';
-export default FactoryMaker.getClassFactory(MssFragmentInfoController); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(MssFragmentInfoController); 
diff --git a/src/mss/MssHandler.js b/src/mss/MssHandler.js
index 2d9893a439..ed6c028b66 100644
--- a/src/mss/MssHandler.js
+++ b/src/mss/MssHandler.js
@@ -200,10 +200,10 @@ function MssHandler(config) {
     }
 
     function registerEvents() {
-        eventBus.on(events.INIT_FRAGMENT_NEEDED, onInitFragmentNeeded, instance, { priority: dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH }); /* jshint ignore:line */
-        eventBus.on(events.PLAYBACK_PAUSED, onPlaybackPaused, instance, { priority: dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH }); /* jshint ignore:line */
-        eventBus.on(events.PLAYBACK_SEEKING, onPlaybackSeeking, instance, { priority: dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH }); /* jshint ignore:line */
-        eventBus.on(events.FRAGMENT_LOADING_COMPLETED, onSegmentMediaLoaded, instance, { priority: dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH }); /* jshint ignore:line */
+        eventBus.on(events.INIT_FRAGMENT_NEEDED, onInitFragmentNeeded, instance, { priority: dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH }); 
+        eventBus.on(events.PLAYBACK_PAUSED, onPlaybackPaused, instance, { priority: dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH }); 
+        eventBus.on(events.PLAYBACK_SEEKING, onPlaybackSeeking, instance, { priority: dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH }); 
+        eventBus.on(events.FRAGMENT_LOADING_COMPLETED, onSegmentMediaLoaded, instance, { priority: dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH }); 
         eventBus.on(events.TTML_TO_PARSE, onTTMLPreProcess, instance);
     }
 
@@ -241,7 +241,7 @@ function MssHandler(config) {
 }
 
 MssHandler.__dashjs_factory_name = 'MssHandler';
-const factory = dashjs.FactoryMaker.getClassFactory(MssHandler); /* jshint ignore:line */
+const factory = dashjs.FactoryMaker.getClassFactory(MssHandler); 
 factory.errors = MssErrors;
-dashjs.FactoryMaker.updateClassFactory(MssHandler.__dashjs_factory_name, factory); /* jshint ignore:line */
-export default factory; /* jshint ignore:line */
+dashjs.FactoryMaker.updateClassFactory(MssHandler.__dashjs_factory_name, factory); 
+export default factory; 
diff --git a/src/mss/parser/MssParser.js b/src/mss/parser/MssParser.js
index 2adc0f9445..66f62905ad 100644
--- a/src/mss/parser/MssParser.js
+++ b/src/mss/parser/MssParser.js
@@ -874,4 +874,4 @@ function MssParser(config) {
 }
 
 MssParser.__dashjs_factory_name = 'MssParser';
-export default FactoryMaker.getClassFactory(MssParser); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(MssParser); 
diff --git a/src/offline/OfflineDownload.js b/src/offline/OfflineDownload.js
index 7c7df15479..bd39750b1b 100644
--- a/src/offline/OfflineDownload.js
+++ b/src/offline/OfflineDownload.js
@@ -667,4 +667,4 @@ function OfflineDownload(config) {
 }
 
 OfflineDownload.__dashjs_factory_name = 'OfflineDownload';
-export default FactoryMaker.getClassFactory(OfflineDownload); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(OfflineDownload); 
diff --git a/src/offline/OfflineStream.js b/src/offline/OfflineStream.js
index f6da2b9923..f394c1e8dd 100644
--- a/src/offline/OfflineStream.js
+++ b/src/offline/OfflineStream.js
@@ -339,4 +339,4 @@ function OfflineStream(config) {
 }
 
 OfflineStream.__dashjs_factory_name = 'OfflineStream';
-export default FactoryMaker.getClassFactory(OfflineStream); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(OfflineStream); 
diff --git a/src/offline/OfflineStreamProcessor.js b/src/offline/OfflineStreamProcessor.js
index 9d6e7c1b18..12f615d0f1 100644
--- a/src/offline/OfflineStreamProcessor.js
+++ b/src/offline/OfflineStreamProcessor.js
@@ -379,5 +379,5 @@ function OfflineStreamProcessor(config) {
 }
 
 OfflineStreamProcessor.__dashjs_factory_name = 'OfflineStreamProcessor';
-const factory = dashjs.FactoryMaker.getClassFactory(OfflineStreamProcessor); /* jshint ignore:line */
+const factory = dashjs.FactoryMaker.getClassFactory(OfflineStreamProcessor); 
 export default factory;
diff --git a/src/offline/controllers/OfflineController.js b/src/offline/controllers/OfflineController.js
index fc37cddcab..f20c61280a 100644
--- a/src/offline/controllers/OfflineController.js
+++ b/src/offline/controllers/OfflineController.js
@@ -383,8 +383,8 @@ function OfflineController(config) {
 }
 
 OfflineController.__dashjs_factory_name = 'OfflineController';
-const factory = dashjs.FactoryMaker.getClassFactory(OfflineController); /* jshint ignore:line */
+const factory = dashjs.FactoryMaker.getClassFactory(OfflineController); 
 factory.events = OfflineEvents;
 factory.errors = OfflineErrors;
-dashjs.FactoryMaker.updateClassFactory(OfflineController.__dashjs_factory_name, factory); /* jshint ignore:line */
+dashjs.FactoryMaker.updateClassFactory(OfflineController.__dashjs_factory_name, factory); 
 export default factory;
diff --git a/src/offline/controllers/OfflineStoreController.js b/src/offline/controllers/OfflineStoreController.js
index 97d89cb922..fa079e4893 100644
--- a/src/offline/controllers/OfflineStoreController.js
+++ b/src/offline/controllers/OfflineStoreController.js
@@ -170,4 +170,4 @@ function OfflineStoreController(config) {
 }
 
 OfflineStoreController.__dashjs_factory_name = 'OfflineStoreController';
-export default FactoryMaker.getClassFactory(OfflineStoreController); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(OfflineStoreController); 
diff --git a/src/offline/net/IndexDBOfflineLoader.js b/src/offline/net/IndexDBOfflineLoader.js
index d64ea3f920..4e2584ac8e 100644
--- a/src/offline/net/IndexDBOfflineLoader.js
+++ b/src/offline/net/IndexDBOfflineLoader.js
@@ -100,5 +100,5 @@ function IndexDBOfflineLoader(config) {
 }
 
 IndexDBOfflineLoader.__dashjs_factory_name = 'IndexDBOfflineLoader';
-const factory = dashjs.FactoryMaker.getClassFactory(IndexDBOfflineLoader); /* jshint ignore:line */
+const factory = dashjs.FactoryMaker.getClassFactory(IndexDBOfflineLoader); 
 export default factory;
diff --git a/src/offline/storage/IndexDBStore.js b/src/offline/storage/IndexDBStore.js
index dbd6fce0de..5aee703f0f 100644
--- a/src/offline/storage/IndexDBStore.js
+++ b/src/offline/storage/IndexDBStore.js
@@ -442,4 +442,4 @@ function IndexDBStore() {
 }
 
 IndexDBStore.__dashjs_factory_name = 'IndexDBStore';
-export default FactoryMaker.getSingletonFactory(IndexDBStore); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(IndexDBStore); 
diff --git a/src/offline/utils/OfflineIndexDBManifestParser.js b/src/offline/utils/OfflineIndexDBManifestParser.js
index 048e72c926..c368715972 100644
--- a/src/offline/utils/OfflineIndexDBManifestParser.js
+++ b/src/offline/utils/OfflineIndexDBManifestParser.js
@@ -489,4 +489,4 @@ function OfflineIndexDBManifestParser(config) {
     return instance;
 }
 OfflineIndexDBManifestParser.__dashjs_factory_name = 'OfflineIndexDBManifestParser';
-export default FactoryMaker.getClassFactory(OfflineIndexDBManifestParser); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(OfflineIndexDBManifestParser); 
diff --git a/src/offline/utils/OfflineUrlUtils.js b/src/offline/utils/OfflineUrlUtils.js
index ea6c9bfa14..79b176f73d 100644
--- a/src/offline/utils/OfflineUrlUtils.js
+++ b/src/offline/utils/OfflineUrlUtils.js
@@ -72,4 +72,4 @@ function OfflineUrlUtils() {
 }
 
 OfflineUrlUtils.__dashjs_factory_name = 'OfflineUrlUtils';
-export default FactoryMaker.getSingletonFactory(OfflineUrlUtils); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(OfflineUrlUtils); 
diff --git a/src/streaming/MediaPlayer.js b/src/streaming/MediaPlayer.js
index 1dfb141308..8cefd05be0 100644
--- a/src/streaming/MediaPlayer.js
+++ b/src/streaming/MediaPlayer.js
@@ -2398,7 +2398,7 @@ function MediaPlayer() {
             return null
         }
         // do not require Protection as dependencies as this is optional and intended to be loaded separately
-        let detectedProtection = dashjs.Protection; /* jshint ignore:line */
+        let detectedProtection = dashjs.Protection; 
         if (typeof detectedProtection === 'function') { //TODO need a better way to register/detect plugin components
             let protection = detectedProtection(context).create();
             Events.extend(detectedProtection.events);
@@ -2434,7 +2434,7 @@ function MediaPlayer() {
             return;
         }
         // do not require MetricsReporting as dependencies as this is optional and intended to be loaded separately
-        let detectedMetricsReporting = dashjs.MetricsReporting; /* jshint ignore:line */
+        let detectedMetricsReporting = dashjs.MetricsReporting; 
         if (typeof detectedMetricsReporting === 'function') { //TODO need a better way to register/detect plugin components
             let metricsReporting = detectedMetricsReporting(context).create();
 
@@ -2458,7 +2458,7 @@ function MediaPlayer() {
         }
 
         // do not require MssHandler as dependencies as this is optional and intended to be loaded separately
-        let detectedMssHandler = dashjs.MssHandler; /* jshint ignore:line */
+        let detectedMssHandler = dashjs.MssHandler; 
         if (typeof detectedMssHandler === 'function') { //TODO need a better way to register/detect plugin components
             Errors.extend(detectedMssHandler.errors);
             mssHandler = detectedMssHandler(context).create({
@@ -2496,7 +2496,7 @@ function MediaPlayer() {
         }
 
         // do not require Offline as dependencies as this is optional and intended to be loaded separately
-        let detectedOfflineController = dashjs.OfflineController; /* jshint ignore:line */
+        let detectedOfflineController = dashjs.OfflineController; 
 
         if (typeof detectedOfflineController === 'function') { //TODO need a better way to register/detect plugin components
             Events.extend(detectedOfflineController.events);
diff --git a/src/streaming/metrics/MetricsReporting.js b/src/streaming/metrics/MetricsReporting.js
index ec854cd15e..d9ead11b79 100644
--- a/src/streaming/metrics/MetricsReporting.js
+++ b/src/streaming/metrics/MetricsReporting.js
@@ -83,7 +83,7 @@ function MetricsReporting() {
 }
 
 MetricsReporting.__dashjs_factory_name = 'MetricsReporting';
-const factory = dashjs.FactoryMaker.getClassFactory(MetricsReporting); /* jshint ignore:line */
+const factory = dashjs.FactoryMaker.getClassFactory(MetricsReporting); 
 factory.events = MetricsReportingEvents;
-dashjs.FactoryMaker.updateClassFactory(MetricsReporting.__dashjs_factory_name, factory); /* jshint ignore:line */
+dashjs.FactoryMaker.updateClassFactory(MetricsReporting.__dashjs_factory_name, factory); 
 export default factory;
diff --git a/src/streaming/metrics/controllers/MetricsCollectionController.js b/src/streaming/metrics/controllers/MetricsCollectionController.js
index 33c02ab408..b88331f660 100644
--- a/src/streaming/metrics/controllers/MetricsCollectionController.js
+++ b/src/streaming/metrics/controllers/MetricsCollectionController.js
@@ -109,4 +109,4 @@ function MetricsCollectionController(config) {
 }
 
 MetricsCollectionController.__dashjs_factory_name = 'MetricsCollectionController';
-export default FactoryMaker.getClassFactory(MetricsCollectionController); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(MetricsCollectionController); 
diff --git a/src/streaming/metrics/controllers/MetricsController.js b/src/streaming/metrics/controllers/MetricsController.js
index 31d6364590..2f477bc01e 100644
--- a/src/streaming/metrics/controllers/MetricsController.js
+++ b/src/streaming/metrics/controllers/MetricsController.js
@@ -97,4 +97,4 @@ function MetricsController(config) {
 }
 
 MetricsController.__dashjs_factory_name = 'MetricsController';
-export default FactoryMaker.getClassFactory(MetricsController); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(MetricsController); 
diff --git a/src/streaming/metrics/controllers/MetricsHandlersController.js b/src/streaming/metrics/controllers/MetricsHandlersController.js
index 21957dbd85..73d26a4735 100644
--- a/src/streaming/metrics/controllers/MetricsHandlersController.js
+++ b/src/streaming/metrics/controllers/MetricsHandlersController.js
@@ -126,4 +126,4 @@ function MetricsHandlersController(config) {
 }
 
 MetricsHandlersController.__dashjs_factory_name = 'MetricsHandlersController';
-export default FactoryMaker.getClassFactory(MetricsHandlersController); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(MetricsHandlersController); 
diff --git a/src/streaming/metrics/controllers/RangeController.js b/src/streaming/metrics/controllers/RangeController.js
index 5736321ef8..d4a98400b1 100644
--- a/src/streaming/metrics/controllers/RangeController.js
+++ b/src/streaming/metrics/controllers/RangeController.js
@@ -101,4 +101,4 @@ function RangeController(config) {
 }
 
 RangeController.__dashjs_factory_name = 'RangeController';
-export default FactoryMaker.getClassFactory(RangeController); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(RangeController); 
diff --git a/src/streaming/metrics/controllers/ReportingController.js b/src/streaming/metrics/controllers/ReportingController.js
index 2c8374e423..afe819048f 100644
--- a/src/streaming/metrics/controllers/ReportingController.js
+++ b/src/streaming/metrics/controllers/ReportingController.js
@@ -73,4 +73,4 @@ function ReportingController(config) {
 }
 
 ReportingController.__dashjs_factory_name = 'ReportingController';
-export default FactoryMaker.getClassFactory(ReportingController); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(ReportingController); 
diff --git a/src/streaming/metrics/metrics/MetricsHandlerFactory.js b/src/streaming/metrics/metrics/MetricsHandlerFactory.js
index 838e057f0e..660c122b89 100644
--- a/src/streaming/metrics/metrics/MetricsHandlerFactory.js
+++ b/src/streaming/metrics/metrics/MetricsHandlerFactory.js
@@ -100,4 +100,4 @@ function MetricsHandlerFactory(config) {
 }
 
 MetricsHandlerFactory.__dashjs_factory_name = 'MetricsHandlerFactory';
-export default FactoryMaker.getSingletonFactory(MetricsHandlerFactory); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(MetricsHandlerFactory); 
diff --git a/src/streaming/metrics/metrics/handlers/BufferLevelHandler.js b/src/streaming/metrics/metrics/handlers/BufferLevelHandler.js
index 75780b554d..c98d1cf27d 100644
--- a/src/streaming/metrics/metrics/handlers/BufferLevelHandler.js
+++ b/src/streaming/metrics/metrics/handlers/BufferLevelHandler.js
@@ -109,4 +109,4 @@ function BufferLevelHandler(config) {
 }
 
 BufferLevelHandler.__dashjs_factory_name = 'BufferLevelHandler';
-export default FactoryMaker.getClassFactory(BufferLevelHandler); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(BufferLevelHandler); 
diff --git a/src/streaming/metrics/metrics/handlers/DVBErrorsHandler.js b/src/streaming/metrics/metrics/handlers/DVBErrorsHandler.js
index 90a772f115..ec586b5b3e 100644
--- a/src/streaming/metrics/metrics/handlers/DVBErrorsHandler.js
+++ b/src/streaming/metrics/metrics/handlers/DVBErrorsHandler.js
@@ -88,4 +88,4 @@ function DVBErrorsHandler(config) {
     return instance;
 }
 
-export default FactoryMaker.getClassFactory(DVBErrorsHandler); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(DVBErrorsHandler); 
diff --git a/src/streaming/metrics/metrics/handlers/GenericMetricHandler.js b/src/streaming/metrics/metrics/handlers/GenericMetricHandler.js
index 9489c2cdcc..90fea1df3d 100644
--- a/src/streaming/metrics/metrics/handlers/GenericMetricHandler.js
+++ b/src/streaming/metrics/metrics/handlers/GenericMetricHandler.js
@@ -69,4 +69,4 @@ function GenericMetricHandler() {
 }
 
 GenericMetricHandler.__dashjs_factory_name = 'GenericMetricHandler';
-export default FactoryMaker.getClassFactory(GenericMetricHandler); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(GenericMetricHandler); 
diff --git a/src/streaming/metrics/metrics/handlers/HttpListHandler.js b/src/streaming/metrics/metrics/handlers/HttpListHandler.js
index caf3a6ce58..fecdf22b2b 100644
--- a/src/streaming/metrics/metrics/handlers/HttpListHandler.js
+++ b/src/streaming/metrics/metrics/handlers/HttpListHandler.js
@@ -110,4 +110,4 @@ function HttpListHandler(config) {
 }
 
 HttpListHandler.__dashjs_factory_name = 'HttpListHandler';
-export default FactoryMaker.getClassFactory(HttpListHandler); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(HttpListHandler); 
diff --git a/src/streaming/metrics/reporting/ReportingFactory.js b/src/streaming/metrics/reporting/ReportingFactory.js
index 97c6c0fc79..d4a2ccba6d 100644
--- a/src/streaming/metrics/reporting/ReportingFactory.js
+++ b/src/streaming/metrics/reporting/ReportingFactory.js
@@ -81,4 +81,4 @@ function ReportingFactory(config) {
 }
 
 ReportingFactory.__dashjs_factory_name = 'ReportingFactory';
-export default FactoryMaker.getSingletonFactory(ReportingFactory); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(ReportingFactory); 
diff --git a/src/streaming/metrics/reporting/reporters/DVBReporting.js b/src/streaming/metrics/reporting/reporters/DVBReporting.js
index 14a5207289..2e840c93b6 100644
--- a/src/streaming/metrics/reporting/reporters/DVBReporting.js
+++ b/src/streaming/metrics/reporting/reporters/DVBReporting.js
@@ -198,4 +198,4 @@ function DVBReporting(config) {
 }
 
 DVBReporting.__dashjs_factory_name = 'DVBReporting';
-export default FactoryMaker.getClassFactory(DVBReporting); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(DVBReporting); 
diff --git a/src/streaming/metrics/utils/DVBErrorsTranslator.js b/src/streaming/metrics/utils/DVBErrorsTranslator.js
index e53e62364d..419687044a 100644
--- a/src/streaming/metrics/utils/DVBErrorsTranslator.js
+++ b/src/streaming/metrics/utils/DVBErrorsTranslator.js
@@ -177,4 +177,4 @@ function DVBErrorsTranslator(config) {
 }
 
 DVBErrorsTranslator.__dashjs_factory_name = 'DVBErrorsTranslator';
-export default FactoryMaker.getSingletonFactory(DVBErrorsTranslator); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(DVBErrorsTranslator); 
diff --git a/src/streaming/metrics/utils/HandlerHelpers.js b/src/streaming/metrics/utils/HandlerHelpers.js
index ff9ccd9808..a72d716de0 100644
--- a/src/streaming/metrics/utils/HandlerHelpers.js
+++ b/src/streaming/metrics/utils/HandlerHelpers.js
@@ -73,4 +73,4 @@ function HandlerHelpers() {
 }
 
 HandlerHelpers.__dashjs_factory_name = 'HandlerHelpers';
-export default FactoryMaker.getSingletonFactory(HandlerHelpers); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(HandlerHelpers); 
diff --git a/src/streaming/metrics/utils/ManifestParsing.js b/src/streaming/metrics/utils/ManifestParsing.js
index af9d9af8d6..e1a875e4d4 100644
--- a/src/streaming/metrics/utils/ManifestParsing.js
+++ b/src/streaming/metrics/utils/ManifestParsing.js
@@ -123,4 +123,4 @@ function ManifestParsing (config) {
 }
 
 ManifestParsing.__dashjs_factory_name = 'ManifestParsing';
-export default FactoryMaker.getSingletonFactory(ManifestParsing); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(ManifestParsing); 
diff --git a/src/streaming/metrics/utils/MetricSerialiser.js b/src/streaming/metrics/utils/MetricSerialiser.js
index bc36065524..e005b375a4 100644
--- a/src/streaming/metrics/utils/MetricSerialiser.js
+++ b/src/streaming/metrics/utils/MetricSerialiser.js
@@ -99,4 +99,4 @@ function MetricSerialiser() {
 }
 
 MetricSerialiser.__dashjs_factory_name = 'MetricSerialiser';
-export default FactoryMaker.getSingletonFactory(MetricSerialiser); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(MetricSerialiser); 
diff --git a/src/streaming/metrics/utils/RNG.js b/src/streaming/metrics/utils/RNG.js
index 8146b4e065..850b3e0143 100644
--- a/src/streaming/metrics/utils/RNG.js
+++ b/src/streaming/metrics/utils/RNG.js
@@ -98,4 +98,4 @@ function RNG() {
 }
 
 RNG.__dashjs_factory_name = 'RNG';
-export default FactoryMaker.getSingletonFactory(RNG); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(RNG); 
diff --git a/src/streaming/protection/Protection.js b/src/streaming/protection/Protection.js
index 14f8af0376..124eb0eb51 100644
--- a/src/streaming/protection/Protection.js
+++ b/src/streaming/protection/Protection.js
@@ -200,8 +200,8 @@ function Protection() {
 }
 
 Protection.__dashjs_factory_name = 'Protection';
-const factory = dashjs.FactoryMaker.getClassFactory(Protection); /* jshint ignore:line */
+const factory = dashjs.FactoryMaker.getClassFactory(Protection); 
 factory.events = ProtectionEvents;
 factory.errors = ProtectionErrors;
-dashjs.FactoryMaker.updateClassFactory(Protection.__dashjs_factory_name, factory); /* jshint ignore:line */
+dashjs.FactoryMaker.updateClassFactory(Protection.__dashjs_factory_name, factory); 
 export default factory;
diff --git a/src/streaming/protection/controllers/ProtectionController.js b/src/streaming/protection/controllers/ProtectionController.js
index df9b6bf998..89f38fc7a7 100644
--- a/src/streaming/protection/controllers/ProtectionController.js
+++ b/src/streaming/protection/controllers/ProtectionController.js
@@ -1136,4 +1136,4 @@ function ProtectionController(config) {
 }
 
 ProtectionController.__dashjs_factory_name = 'ProtectionController';
-export default FactoryMaker.getClassFactory(ProtectionController); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(ProtectionController); 
diff --git a/src/streaming/protection/controllers/ProtectionKeyController.js b/src/streaming/protection/controllers/ProtectionKeyController.js
index ed0adf3c64..0423a33bec 100644
--- a/src/streaming/protection/controllers/ProtectionKeyController.js
+++ b/src/streaming/protection/controllers/ProtectionKeyController.js
@@ -401,4 +401,4 @@ function ProtectionKeyController() {
 }
 
 ProtectionKeyController.__dashjs_factory_name = 'ProtectionKeyController';
-export default FactoryMaker.getSingletonFactory(ProtectionKeyController); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(ProtectionKeyController); 
diff --git a/src/streaming/protection/drm/KeySystemClearKey.js b/src/streaming/protection/drm/KeySystemClearKey.js
index b6f5e3797b..e21970e496 100644
--- a/src/streaming/protection/drm/KeySystemClearKey.js
+++ b/src/streaming/protection/drm/KeySystemClearKey.js
@@ -141,4 +141,4 @@ function KeySystemClearKey(config) {
 }
 
 KeySystemClearKey.__dashjs_factory_name = 'KeySystemClearKey';
-export default FactoryMaker.getSingletonFactory(KeySystemClearKey); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(KeySystemClearKey); 
diff --git a/src/streaming/protection/drm/KeySystemPlayReady.js b/src/streaming/protection/drm/KeySystemPlayReady.js
index 91058a5897..8b6111fc73 100644
--- a/src/streaming/protection/drm/KeySystemPlayReady.js
+++ b/src/streaming/protection/drm/KeySystemPlayReady.js
@@ -306,4 +306,4 @@ function KeySystemPlayReady(config) {
 }
 
 KeySystemPlayReady.__dashjs_factory_name = 'KeySystemPlayReady';
-export default FactoryMaker.getSingletonFactory(KeySystemPlayReady); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(KeySystemPlayReady); 
diff --git a/src/streaming/protection/drm/KeySystemW3CClearKey.js b/src/streaming/protection/drm/KeySystemW3CClearKey.js
index 8bd2e31bcd..3825e77899 100644
--- a/src/streaming/protection/drm/KeySystemW3CClearKey.js
+++ b/src/streaming/protection/drm/KeySystemW3CClearKey.js
@@ -112,5 +112,5 @@ function KeySystemW3CClearKey(config) {
 }
 
 KeySystemW3CClearKey.__dashjs_factory_name = 'KeySystemW3CClearKey';
-export default FactoryMaker.getSingletonFactory(KeySystemW3CClearKey); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(KeySystemW3CClearKey); 
 
diff --git a/src/streaming/protection/drm/KeySystemWidevine.js b/src/streaming/protection/drm/KeySystemWidevine.js
index f195e3fa95..09a8190ee4 100644
--- a/src/streaming/protection/drm/KeySystemWidevine.js
+++ b/src/streaming/protection/drm/KeySystemWidevine.js
@@ -85,4 +85,4 @@ function KeySystemWidevine(config) {
 }
 
 KeySystemWidevine.__dashjs_factory_name = 'KeySystemWidevine';
-export default FactoryMaker.getSingletonFactory(KeySystemWidevine); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(KeySystemWidevine); 
diff --git a/src/streaming/protection/models/ProtectionModel_01b.js b/src/streaming/protection/models/ProtectionModel_01b.js
index 0499298aa3..c15d45a911 100644
--- a/src/streaming/protection/models/ProtectionModel_01b.js
+++ b/src/streaming/protection/models/ProtectionModel_01b.js
@@ -454,4 +454,4 @@ function ProtectionModel_01b(config) {
 }
 
 ProtectionModel_01b.__dashjs_factory_name = 'ProtectionModel_01b';
-export default FactoryMaker.getClassFactory(ProtectionModel_01b); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(ProtectionModel_01b); 
diff --git a/src/streaming/protection/models/ProtectionModel_21Jan2015.js b/src/streaming/protection/models/ProtectionModel_21Jan2015.js
index bffc1da24a..6313b634de 100644
--- a/src/streaming/protection/models/ProtectionModel_21Jan2015.js
+++ b/src/streaming/protection/models/ProtectionModel_21Jan2015.js
@@ -579,4 +579,4 @@ function ProtectionModel_21Jan2015(config) {
 }
 
 ProtectionModel_21Jan2015.__dashjs_factory_name = 'ProtectionModel_21Jan2015';
-export default FactoryMaker.getClassFactory(ProtectionModel_21Jan2015); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(ProtectionModel_21Jan2015); 
diff --git a/src/streaming/protection/models/ProtectionModel_3Feb2014.js b/src/streaming/protection/models/ProtectionModel_3Feb2014.js
index b7560cbe0c..dea11cd358 100644
--- a/src/streaming/protection/models/ProtectionModel_3Feb2014.js
+++ b/src/streaming/protection/models/ProtectionModel_3Feb2014.js
@@ -401,4 +401,4 @@ function ProtectionModel_3Feb2014(config) {
 }
 
 ProtectionModel_3Feb2014.__dashjs_factory_name = 'ProtectionModel_3Feb2014';
-export default FactoryMaker.getClassFactory(ProtectionModel_3Feb2014); /* jshint ignore:line */
+export default FactoryMaker.getClassFactory(ProtectionModel_3Feb2014); 
diff --git a/src/streaming/protection/servers/ClearKey.js b/src/streaming/protection/servers/ClearKey.js
index 231b0895bb..c3b33adb4f 100644
--- a/src/streaming/protection/servers/ClearKey.js
+++ b/src/streaming/protection/servers/ClearKey.js
@@ -89,4 +89,4 @@ function ClearKey() {
 }
 
 ClearKey.__dashjs_factory_name = 'ClearKey';
-export default FactoryMaker.getSingletonFactory(ClearKey); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(ClearKey); 
diff --git a/src/streaming/protection/servers/DRMToday.js b/src/streaming/protection/servers/DRMToday.js
index 66645bc9ba..9c28e19afe 100644
--- a/src/streaming/protection/servers/DRMToday.js
+++ b/src/streaming/protection/servers/DRMToday.js
@@ -105,4 +105,4 @@ function DRMToday(config) {
 }
 
 DRMToday.__dashjs_factory_name = 'DRMToday';
-export default FactoryMaker.getSingletonFactory(DRMToday); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(DRMToday); 
diff --git a/src/streaming/protection/servers/PlayReady.js b/src/streaming/protection/servers/PlayReady.js
index 542cef2ced..92e6a757f6 100644
--- a/src/streaming/protection/servers/PlayReady.js
+++ b/src/streaming/protection/servers/PlayReady.js
@@ -147,4 +147,4 @@ function PlayReady() {
 }
 
 PlayReady.__dashjs_factory_name = 'PlayReady';
-export default FactoryMaker.getSingletonFactory(PlayReady); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(PlayReady); 
diff --git a/src/streaming/protection/servers/Widevine.js b/src/streaming/protection/servers/Widevine.js
index 37247b05a1..6711891b0b 100644
--- a/src/streaming/protection/servers/Widevine.js
+++ b/src/streaming/protection/servers/Widevine.js
@@ -70,4 +70,4 @@ function Widevine() {
 }
 
 Widevine.__dashjs_factory_name = 'Widevine';
-export default FactoryMaker.getSingletonFactory(Widevine); /* jshint ignore:line */
+export default FactoryMaker.getSingletonFactory(Widevine);