diff --git a/javascript/src/iframe/viamapi-iframe.js b/javascript/src/iframe/viamapi-iframe.js
index bd882695704604341c336e6b7c9acdea51d13bc9..072aebd3ba12689350e9042e5aa23645c8dea953 100644
--- a/javascript/src/iframe/viamapi-iframe.js
+++ b/javascript/src/iframe/viamapi-iframe.js
@@ -2324,49 +2324,57 @@ connection.promise.then(parent => {
 
   window.addEventListener('storage', event => {
     if (event.key === "authenticatedIdentity" && event.newValue === null) {
-      var publicKey = window.currentlyAuthenticatedIdentity.authentication.publicKey;
+      const publicKey = window.currentlyAuthenticatedIdentity.authentication.publicKey;
       window.currentlyLoadedIdentity = null;
       window.currentlyAuthenticatedIdentity = null;
-      var event = createEvent("LogoutFromAnotherTab", "Logout", [publicKey]);
-      parent.onEvent(event)
+      const event = createEvent("LogoutFromAnotherTab", "Logout", [publicKey]);
+      parent.onEvent(event);
     }
   });
 
-  var identities = localStorage.getItem("identities");
+  const identities = localStorage.getItem("identities");
 
   console.log("Library loaded at: " + new Date().toISOString());
 
   if (identities === "" || identities === null) {
     //console.log("Setting up empty version")
-    localStorage.setItem("identities", JSON.stringify({}))
+    localStorage.setItem("identities", JSON.stringify({}));
   }
 
-  if (localStorage.getItem("uuid") === null || localStorage.getItem("token") === null
-    || localStorage.getItem("authenticatedIdentity") === null) {
+  if (
+    localStorage.getItem("uuid") === null ||
+    localStorage.getItem("token") === null ||
+    localStorage.getItem("authenticatedIdentity") === null
+  ) {
     localStorage.removeItem("uuid");
     localStorage.removeItem("token");
-    localStorage.removeItem("authenticatedIdentity")
+    localStorage.removeItem("authenticatedIdentity");
   } else {
     window.authenticationPublicKey = localStorage.getItem("authenticatedIdentity");
-    var pinCode = getPincode(authenticationPublicKey);
+    const pinCode = getPincode(window.authenticationPublicKey);
 
-    if(pinCode === "" || pinCode == null) {
-      loadIdentityInternal(authenticationPublicKey, "00000000").then(result => {
-        if(result.code !== "200") {
-          console.log(result);
+    if (pinCode === "" || pinCode === null) {
+      loadIdentityInternal(window.authenticationPublicKey, "00000000").then(result => {
+        if (result.code !== "200") {
           //var event = createEvent("CanNotLoadIdentity", "ErrorDuringLoadingIdentity", [authenticationPublicKey])
           //parent.onEvent(event)
-          var event = createEvent("CanNotGetPincodeForAuthenticatedIdentity", "IdentityNotLoaded", [authenticationPublicKey]);
-          parent.onEvent(event)
+          const event = createEvent(
+            "CanNotGetPincodeForAuthenticatedIdentity",
+            "IdentityNotLoaded",
+            [window.authenticationPublicKey]
+          );
+          parent.onEvent(event);
         }
       });
-      //var event = createEvent("CanNotGetPincodeForAuthenticatedIdentity", "IdentityNotLoaded", [authenticationPublicKey])
-      //parent.onEvent(event)
     } else {
-      loadIdentityInternal(authenticationPublicKey, pinCode).then(result => {
-        if(result.code !== "200") {
-          var event = createEvent("CanNotLoadIdentity", "ErrorDuringLoadingIdentity", [authenticationPublicKey]);
-          parent.onEvent(event)
+      loadIdentityInternal(window.authenticationPublicKey, pinCode).then(result => {
+        if (result.code !== "200") {
+          const event = createEvent(
+            "CanNotLoadIdentity",
+            "ErrorDuringLoadingIdentity",
+            [window.authenticationPublicKey]
+          );
+          parent.onEvent(event);
         }
       });
     }