diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/globals.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/globals.js
index 60b895487d..5ea6353c65 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/globals.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/globals.js
@@ -3,7 +3,7 @@
 'require form';
 
 return view.extend({
-	render: function() {
+	render() {
 		let m, s, o;
 
 		m = new form.Map('keepalived');
diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/ipaddress.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/ipaddress.js
index 3efeb46206..561b1db003 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/ipaddress.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/ipaddress.js
@@ -6,14 +6,14 @@
 'require tools.widgets as widgets';
 
 return view.extend({
-	load: function() {
+	load() {
 		return Promise.all([
 			uci.load('keepalived'),
 		]);
 	},
 
-	renderIPAddress: function(m) {
-		var s, o;
+	renderIPAddress(m) {
+		let s, o;
 
 		s = m.section(form.GridSection, 'ipaddress', _('IP Addresses'),
 			_('Addresses would be referenced into Static and Virtual IP Address of VRRP instances'));
@@ -53,11 +53,9 @@ return view.extend({
 		o.optional = true;
 	},
 
-	renderStaticIPAddress: function(m) {
-		var s, o;
-		var ipaddress;
-
-		ipaddress = uci.sections('keepalived', 'ipaddress');
+	renderStaticIPAddress(m) {
+		let s, o;
+		let ipaddress = uci.sections('keepalived', 'ipaddress');
 		if (ipaddress == '') {
 			ui.addNotification(null, E('p', _('IP Addresses must be configured for Static IP List')));
 		}
@@ -72,14 +70,14 @@ return view.extend({
 
 		o = s.option(form.DynamicList, 'address', _('IP Address'),
 			_('List of IP Addresses'));
-		for (var i = 0; i < ipaddress.length; i++) {
+		for (let i = 0; i < ipaddress.length; i++) {
 			o.value(ipaddress[i]['name']);
 		}
 		o.optional = true;
 	},
 
-	render: function() {
-		var m;
+	render() {
+		let m;
 
 		m = new form.Map('keepalived');
 
diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/notification.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/notification.js
index c12a63be8e..3a9182220d 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/notification.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/notification.js
@@ -6,12 +6,12 @@
 var isReadonlyView = !L.hasViewPermission() || null;
 
 return view.extend({
-	load: function() {
+	load() {
 		return L.resolveDefault(fs.read('/etc/keepalived.user'), '');
 	},
 
-	handleSave: function(ev) {
-		var value = (document.querySelector('textarea').value || '').trim().replace(/\r\n/g, '\n') + '\n';
+	handleSave(ev) {
+		const value = (document.querySelector('textarea').value || '').trim().replace(/\r\n/g, '\n') + '\n';
 
 		return fs.write('/etc/keepalived.user', value).then(function(rc) {
 			document.querySelector('textarea').value = value;
@@ -21,7 +21,7 @@ return view.extend({
 		});
 	},
 
-	render: function(keepalived) {
+	render(keepalived) {
 		return E([
 			E('h2', _('Keepalived.user')),
 			E('p', { 'class': 'cbi-section-descr' }, _('This is the /etc/keepalived.user file in which custom commands can be defined.')),
diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/overview.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/overview.js
index 3de2213209..10da0c9ad8 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/overview.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/overview.js
@@ -12,14 +12,14 @@ const callKeepalivedStatus = rpc.declare({
 });
 
 return view.extend({
-	load: function() {
+	load() {
 		return Promise.all([
 			uci.load('keepalived'),
 		]);
 	},
 
-	render: function() {
-		var table =
+	render() {
+		const table =
 			E('table', { 'class': 'table lases' }, [
 				E('tr', { 'class': 'tr table-titles' }, [
 					E('th', { 'class': 'th' }, _('Name')),
@@ -35,14 +35,14 @@ return view.extend({
 
 		poll.add(function() {
 			return callKeepalivedStatus().then(function(instancesInfo) {
-				var targets = Array.isArray(instancesInfo.status) ? instancesInfo.status : [];
-				var instances = uci.sections('keepalived', 'vrrp_instance');
+				const targets = Array.isArray(instancesInfo.status) ? instancesInfo.status : [];
+				const instances = uci.sections('keepalived', 'vrrp_instance');
 
 				cbi_update_table(table,
 					targets.map(function(target) {
-						var state;
-						var state_initial;
-						var instance_state = target.data.state;
+						let state;
+						let state_initial;
+						const instance_state = target.data.state;
 
 						if (instance_state === 2) {
 							state = 'MASTER';
@@ -59,7 +59,6 @@ return view.extend({
 						if (instances != '') {
 							for (var i = 0; i < instances.length; i++) {
 								if (instances[i]['name'] == target.data.iname) {
-									state = state;
 									state_initial = instances[i]['state'];
 									break;
 								}
diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/peers.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/peers.js
index be90ad92da..83111e3109 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/peers.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/peers.js
@@ -10,14 +10,13 @@ return view.extend({
 		expect: { '': {} }
 	}),
 
-	load: function() {
+	load() {
 		return Promise.all([
 			this.callHostHints(),
 		]);
 	},
 
-	render: function(data) {
-		var hosts = data[0];
+	render([hosts]) {
 		let m, s, o;
 
 		m = new form.Map('keepalived');
@@ -36,11 +35,11 @@ return view.extend({
 		o.optional = false;
 		o.rmempty = false;
 		o.datatype = 'ipaddr';
-		for(var mac in hosts) {
+		for(let mac in hosts) {
 			if (hosts[mac]['ipaddrs'] == 'undefined') {
 				continue;
 			}
-			for(var i = 0; i < hosts[mac]['ipaddrs'].length; i++) {
+			for(let i = 0; i < hosts[mac]['ipaddrs'].length; i++) {
 				o.value(hosts[mac]['ipaddrs'][i]);
 			}
 		}
diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/route.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/route.js
index 2bb560483d..4500d7beab 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/route.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/route.js
@@ -6,14 +6,14 @@
 'require tools.widgets as widgets';
 
 return view.extend({
-	load: function() {
+	load() {
 		return Promise.all([
 			uci.load('keepalived'),
 		]);
 	},
 
-	renderRoute: function(m) {
-		var s, o;
+	renderRoute(m) {
+		let s, o;
 
 		s = m.section(form.GridSection, 'route', _('Routes'),
 			_('Routes would be referenced into Static and Virtual Routes of VRRP instances'));
@@ -59,9 +59,9 @@ return view.extend({
 		o.placeholder = 'name';
 	},
 
-	renderStaticRoutes: function(m) {
-		var s, o;
-		var route;
+	renderStaticRoutes(m) {
+		let s, o;
+		let route;
 
 		route = uci.sections('keepalived', 'route');
 		if (route == '') {
@@ -78,14 +78,14 @@ return view.extend({
 
 		o = s.option(form.DynamicList, 'route', _('Route'),
 			_('List of Route Object'));
-		for (var i = 0; i < route.length; i++) {
+		for (let i = 0; i < route.length; i++) {
 			o.value(route[i]['name']);
 		}
 		o.optional = true;
 	},
 
-	render: function() {
-		var m;
+	render() {
+		let m;
 
 		m = new form.Map('keepalived');
 
diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/script.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/script.js
index 6bc8156ee8..d05bcb2728 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/script.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/script.js
@@ -5,15 +5,15 @@
 'require uci';
 
 return view.extend({
-	load: function() {
+	load() {
 		return Promise.all([
 			uci.load('keepalived'),
 		]);
 	},
 
-	renderTrackScript: function(m) {
-		var s, o;
-		var vrrp_scripts;
+	renderTrackScript(m) {
+		let s, o;
+		let vrrp_scripts;
 
 		vrrp_scripts = uci.sections('keepalived', 'vrrp_script');
 		if (vrrp_scripts == '') {
@@ -50,8 +50,8 @@ return view.extend({
 		o.value('noreverse', _('No Reverse'));
 	},
 
-	renderVRRPScript: function(m) {
-		var s, o;
+	renderVRRPScript(m) {
+		let s, o;
 
 		s = m.section(form.GridSection, 'vrrp_script', _('VRRP Script'),
 			_('Adds a script to be executed periodically.') + ' ' +
@@ -94,8 +94,8 @@ return view.extend({
 		o.datatype = 'uinteger';
 	},
 
-	render: function() {
-		var m;
+	render() {
+		let m;
 
 		m = new form.Map('keepalived');
 
diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/servers.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/servers.js
index 80ead84216..8ee097119e 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/servers.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/servers.js
@@ -4,15 +4,15 @@
 'require uci';
 
 return view.extend({
-	load: function() {
+	load() {
 		return Promise.all([
 			uci.load('keepalived'),
 		]);
 	},
 
-	renderVirtualServer: function(m) {
-		var s, o;
-		var real_servers;
+	renderVirtualServer(m) {
+		let s, o;
+		let real_servers;
 
 		s = m.section(form.GridSection, 'virtual_server', _('Virtual Server'),
 			_('A virtual server is a service configured to listen ' +
@@ -119,9 +119,9 @@ return view.extend({
 		o.modalonly = true;
 	},
 
-	renderRealServer: function(m) {
-		var s, o;
-		var urls;
+	renderRealServer(m) {
+		let s, o;
+		let urls;
 
 		s = m.section(form.GridSection, 'real_server', _('Real Servers'),
 			_('Real Server to redirect all request'));
@@ -179,7 +179,7 @@ return view.extend({
 		urls = uci.sections('keepalived', 'url');
 		o = s.option(form.DynamicList, 'url', _('URLs'));
 		if (urls != '') {
-			for (var i = 0; i < urls.length; i++) {
+			for (let i = 0; i < urls.length; i++) {
 				o.value(urls[i].name);
 			}
 		}
@@ -193,8 +193,8 @@ return view.extend({
 		o.datatype = 'uinteger';
 	},
 
-	render: function() {
-		var m;
+	render() {
+		let m;
 
 		m = new form.Map('keepalived');
 
diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/track_interface.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/track_interface.js
index ac19dc55be..f00797980a 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/track_interface.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/track_interface.js
@@ -5,7 +5,7 @@
 'require uci';
 
 return view.extend({
-	render: function() {
+	render() {
 		let m, s, o;
 
 		m = new form.Map('keepalived');
diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/url.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/url.js
index 16cb446367..66918a68fb 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/url.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/url.js
@@ -3,7 +3,7 @@
 'require form';
 
 return view.extend({
-	render: function() {
+	render() {
 		let m, s, o;
 
 		m = new form.Map('keepalived');
diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/vrrp_instance.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/vrrp_instance.js
index afadeaac77..86e14927e8 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/vrrp_instance.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/vrrp_instance.js
@@ -6,15 +6,15 @@
 'require tools.widgets as widgets';
 
 return view.extend({
-	load: function() {
+	load() {
 		return Promise.all([
 			network.getDevices(),
 			uci.load('keepalived'),
 		]);
 	},
 
-	renderGeneralTab: function(s) {
-		var o, ipaddress;
+	renderGeneralTab(s) {
+		let o, ipaddress;
 
 		o = s.taboption('general',form.Value, 'name', _('Name'));
 		o.rmempty = false;
@@ -72,7 +72,7 @@ return view.extend({
 			_('Addresses add|del on change to MASTER, to BACKUP.') + ' ' +
 			_('With the same entries on other machines, the opposite transition will be occurring.'));
 		if (ipaddress != '') {
-			for (var i = 0; i < ipaddress.length; i++) {
+			for (let i = 0; i < ipaddress.length; i++) {
 				o.value(ipaddress[i]['name']);
 			}
 		}
@@ -80,27 +80,27 @@ return view.extend({
 		o.optional = false;
 	},
 
-	renderPeerTab: function(s, netDevs) {
-		var o;
+	renderPeerTab(s, netDevs) {
+		let o;
 
 		o = s.taboption('peer', form.ListValue, 'unicast_src_ip', _('Unicast Source IP'),
 			_('Default IP for binding vrrpd is the primary IP on interface'));
 		o.datatype = 'ipaddr';
 		o.optional = true;
 		o.modalonly = true;
-		for (var i = 0; i < netDevs.length; i++) {
-			var addrs = netDevs[i].getIPAddrs();
-			for (var j = 0; j < addrs.length; j++) {
+		for (let i = 0; i < netDevs.length; i++) {
+			let addrs = netDevs[i].getIPAddrs();
+			for (let j = 0; j < addrs.length; j++) {
 				o.value(addrs[j].split('/')[0]);
 			}
 		}
 
-		var peers = uci.sections('keepalived', 'peer');
+		let peers = uci.sections('keepalived', 'peer');
 		o = s.taboption('peer', form.DynamicList, 'unicast_peer', _('Peer'),
 			_('Do not send VRRP adverts over VRRP multicast group.') + ' ' +
 			_('Instead it sends adverts to the following list of ip addresses using unicast design fashion'));
 		if (peers != '') {
-			for (var i = 0; i < peers.length; i++) {
+			for (let i = 0; i < peers.length; i++) {
 				o.value(peers[i]['name']);
 			}
 		}
@@ -124,8 +124,8 @@ return view.extend({
 		o.depends({ 'auth_type' : 'PASS' });
 	},
 
-	renderGARPTab: function(s) {
-		var o;
+	renderGARPTab(s) {
+		let o;
 
 		o = s.taboption('garp', form.ListValue, 'garp_master_delay', _('GARP Delay'),
 			_('Gratuitous Master Delay in seconds'));
@@ -172,8 +172,8 @@ return view.extend({
 		o.value('60');
 	},
 
-	renderAdvancedTab: function(s) {
-		var o;
+	renderAdvancedTab(s) {
+		let o;
 
 		o = s.taboption('advanced', form.Value, 'use_vmac', _('Use VMAC'),
 			_('Use VRRP Virtual MAC'));
@@ -234,9 +234,9 @@ return view.extend({
 		o.modalonly = true;
 	},
 
-	renderTrackingTab: function(s) {
-		var o;
-		var ipaddress, routes, interfaces, scripts;
+	renderTrackingTab(s) {
+		let o;
+		let ipaddress, routes, interfaces, scripts;
 
 		ipaddress = uci.sections('keepalived', 'ipaddress');
 		routes = uci.sections('keepalived', 'route');
@@ -249,7 +249,7 @@ return view.extend({
 			_('To decrease the number of packets sent in adverts, you can exclude most IPs from adverts.'));
 		o.modalonly = true;
 		if (ipaddress != '') {
-			for (var i = 0; i < ipaddress.length; i++) {
+			for (let i = 0; i < ipaddress.length; i++) {
 				o.value(ipaddress[i]['name']);
 			}
 		}
@@ -258,7 +258,7 @@ return view.extend({
 			_('Routes add|del when changing to MASTER, to BACKUP'));
 		o.modalonly = true;
 		if (routes != '') {
-			for (var i = 0; i < routes.length; i++) {
+			for (let i = 0; i < routes.length; i++) {
 				o.value(routes[i]['name']);
 			}
 		}
@@ -267,7 +267,7 @@ return view.extend({
 			_('Go to FAULT state if any of these go down'));
 		o.modalonly = true;
 		if (interfaces != '') {
-			for (var i = 0; i < interfaces.length; i++) {
+			for (let i = 0; i < interfaces.length; i++) {
 				o.value(interfaces[i]['name']);
 			}
 		}
@@ -276,15 +276,14 @@ return view.extend({
 			_('Go to FAULT state if any of these go down, if unweighted'));
 		o.modalonly = true;
 		if (scripts != '') {
-			for (var i = 0; i < scripts.length; i++) {
+			for (let i = 0; i < scripts.length; i++) {
 				o.value(scripts[i]['name']);
 			}
 		}
 	},
 
-	render: function(data) {
-		var netDevs = data[0];
-		let m, s, o;
+	render([netDevs]) {
+		let m, s;
 
 		m = new form.Map('keepalived');
 
@@ -294,11 +293,11 @@ return view.extend({
 		s.addremove = true;
 		s.nodescriptions = true;
 
-		o = s.tab('general', _('General'));
-		o = s.tab('peer', _('Peer'));
-		o = s.tab('tracking', _('Tracking'));
-		o = s.tab('garp', _('GARP'));
-		o = s.tab('advanced', _('Advanced'));
+		s.tab('general', _('General'));
+		s.tab('peer', _('Peer'));
+		s.tab('tracking', _('Tracking'));
+		s.tab('garp', _('GARP'));
+		s.tab('advanced', _('Advanced'));
 
 		this.renderGeneralTab(s);
 		this.renderPeerTab(s, netDevs);
diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/vrrp_sync_group.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/vrrp_sync_group.js
index 648cb7109b..d313d655ec 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/vrrp_sync_group.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/keepalived/vrrp_sync_group.js
@@ -5,17 +5,15 @@
 'require uci';
 
 return view.extend({
-	load: function() {
+	load() {
 		return Promise.all([
 			uci.load('keepalived'),
 		]);
 	},
 
-	render: function(data) {
+	render(data) {
 		let m, s, o;
-		var instances;
-
-		instances = uci.sections('keepalived', 'vrrp_instance');
+		let instances = uci.sections('keepalived', 'vrrp_instance');
 		if (instances == '' || instances.length < 1) {
 			ui.addNotification(null, E('p', _('Instances must be configured for VRRP Groups')));
 		}
@@ -37,7 +35,7 @@ return view.extend({
 		o = s.option(form.DynamicList, 'group', _('Instance Group'));
 		o.rmempty = false;
 		o.optional = false;
-		for (var i = 0; i < instances.length; i++) {
+		for (let i = 0; i < instances.length; i++) {
 			o.value(instances[i]['name']);
 		}
 
diff --git a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/status/include/35_keepalived.js b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/status/include/35_keepalived.js
index c0495bc4d5..af09e0a32f 100644
--- a/applications/luci-app-keepalived/htdocs/luci-static/resources/view/status/include/35_keepalived.js
+++ b/applications/luci-app-keepalived/htdocs/luci-static/resources/view/status/include/35_keepalived.js
@@ -12,18 +12,18 @@ const callKeepalivedStatus = rpc.declare({
 return baseclass.extend({
 	title: _('Keepalived Instances'),
 
-	load: function() {
+	load() {
 		return Promise.all([
 			callKeepalivedStatus(),
 			uci.load('keepalived'),
 		]);
 	},
 
-	render: function(data) {
-		var targets = (data[0].status) ? data[0].status : [];
-		var instances = uci.sections('keepalived', 'vrrp_instance');
+	render(data) {
+		const targets = (data[0].status) ? data[0].status : [];
+		const instances = uci.sections('keepalived', 'vrrp_instance');
 
-		var table =
+		const table =
 			E('table', { 'class': 'table lases' }, [
 				E('tr', { 'class': 'tr table-titles' }, [
 					E('th', { 'class': 'th' }, _('Name')),
@@ -39,9 +39,9 @@ return baseclass.extend({
 
 		cbi_update_table(table,
 			targets.map(function(target) {
-				var state;
-				var state_initial;
-				var instance_state = target.data.state;
+				let state;
+				let state_initial;
+				const instance_state = target.data.state;
 
 				if (instance_state === 2) {
 					state = 'MASTER';
@@ -56,9 +56,8 @@ return baseclass.extend({
 				}
 
 				if (instances != '') {
-					for (var i = 0; i < instances.length; i++) {
+					for (let i = 0; i < instances.length; i++) {
 						if (instances[i]['name'] == target.data.iname) {
-							state = state;
 							state_initial = instances[i]['state'];
 							break;
 						}