diff --git a/javascript/src/iframe/viamapi-iframe.js b/javascript/src/iframe/viamapi-iframe.js
index ae57de97c3e7095ccb7feca653b816c03ad0fb09..71d24b5c84bebdc063dae34358d72e8e0b9aab62 100644
--- a/javascript/src/iframe/viamapi-iframe.js
+++ b/javascript/src/iframe/viamapi-iframe.js
@@ -1348,67 +1348,64 @@ window.currentlyLoadedIdentity = null;
 window.lastTimeGetProfile = 0;
 
 function executeRestfulFunction(type, that, fn, ...args) {
-  if(type === "private") {
+  const { currentlyAuthenticatedIdentity, viamApi, loadedIdentities, currentlyLoadedIdentity } = window;
+
+  if (type === "private") {
     return new Penpal.Promise(executeResult => {
       fn.apply(that, args).then((response) => {
         if (response.data.code === "400" && response.data.status === "Bad session") {
-          console.log("Trying to login again");
-          if(currentlyAuthenticatedIdentity !== "" && currentlyAuthenticatedIdentity != null) {
+          if (currentlyAuthenticatedIdentity !== "" && currentlyAuthenticatedIdentity !== null) {
             viamApi.identityLogin("previousaddeddevice").then((response1) => {
               if (response1.data.code === "200") {
-                //console.log(response.data.data)
-                var uuid = response1.data.data["Uuid"];
-                var token = response1.data.data["Session"];
-                //console.log(uuid + " " + token)
+                const uuid = response1.data.data["Uuid"];
+                const token = response1.data.data["Session"];
                 viamApi.setSessionData(uuid, token);
                 localStorage.setItem("uuid", uuid);
                 localStorage.setItem("token", token);
                 localStorage.setItem("authenticatedIdentity", currentlyAuthenticatedIdentity.authentication.publicKey);
-                currentlyAuthenticatedIdentity = loadedIdentities[currentlyAuthenticatedIdentity.authentication.publicKey];
+                window.currentlyAuthenticatedIdentity = loadedIdentities[currentlyAuthenticatedIdentity.authentication.publicKey];
                 setKeyForUUID(uuid, currentlyAuthenticatedIdentity.authentication.publicKey);
-                lastTimeGetProfile = 0;
+                window.lastTimeGetProfile = 0;
                 fn.apply(null, args).then((response2) => {
-                  executeResult(response2.data)
+                  executeResult(response2.data);
                 });
               } else {
-                executeResult(response1.data)
+                executeResult(response1.data);
               }
             });
           } else {
-            if(currentlyLoadedIdentity !== "" && currentlyLoadedIdentity != null) {
+            if (currentlyLoadedIdentity !== "" && currentlyLoadedIdentity !== null) {
               viamApi.identityLogin("previousaddeddevice").then((response1) => {
                 if (response1.data.code === "200") {
-                  //console.log(response.data.data)
-                  var uuid = response1.data.data["Uuid"];
-                  var token = response1.data.data["Session"];
-                  //console.log(uuid + " " + token)
+                  const uuid = response1.data.data["Uuid"];
+                  const token = response1.data.data["Session"];
                   viamApi.setSessionData(uuid, token);
                   localStorage.setItem("uuid", uuid);
                   localStorage.setItem("token", token);
                   localStorage.setItem("authenticatedIdentity", currentlyLoadedIdentity.authentication.publicKey);
-                  currentlyAuthenticatedIdentity = loadedIdentities[currentlyLoadedIdentity.authentication.publicKey];
+                  window.currentlyAuthenticatedIdentity = loadedIdentities[currentlyLoadedIdentity.authentication.publicKey];
                   setKeyForUUID(uuid, currentlyLoadedIdentity.authentication.publicKey);
-                  lastTimeGetProfile = 0;
+                  window.lastTimeGetProfile = 0;
                   fn.apply(null, args).then((response2) => {
-                    executeResult(response2.data)
+                    executeResult(response2.data);
                   });
                 } else {
-                  executeResult(response1.data)
+                  executeResult(response1.data);
                 }
               });
             } else {
-              executeResult(response.data)
+              executeResult(response.data);
             }
           }
         } else {
-          executeResult(response.data)
+          executeResult(response.data);
         }
       });
     });
   } else {
     return new Penpal.Promise(executeResult => {
       fn.apply(that, args).then((response) => {
-        executeResult(response.data)
+        executeResult(response.data);
       });
     });
   }