diff --git a/src/main/java/org/gcube/portlets/admin/OpenIdConnectRESTHelperExtended.java b/src/main/java/org/gcube/portlets/admin/OpenIdConnectRESTHelperExtended.java
index 9757d5d..b7c515e 100644
--- a/src/main/java/org/gcube/portlets/admin/OpenIdConnectRESTHelperExtended.java
+++ b/src/main/java/org/gcube/portlets/admin/OpenIdConnectRESTHelperExtended.java
@@ -44,7 +44,12 @@ public class OpenIdConnectRESTHelperExtended extends OpenIdConnectRESTHelper {
             String client_secret,
             List<String> permissions) throws OpenIdConnectRESTHelperException {
 
-        logger.info("Queried exchangeToken for context " + audience);
+        // logger.info("Queried exchangeToken for context " + audience);
+
+        // logger.info("token url " + tokenUrl);
+        // logger.info("exchangedToken credentials " + client_id + " " + client_secret) ;
+
+
 
         Map<String, List<String>> params = new HashMap<>();
         Map<String, String> extraHeaders = new HashMap<>();
diff --git a/src/main/java/org/gcube/portlets/admin/RPTTokenReader.java b/src/main/java/org/gcube/portlets/admin/RPTTokenReader.java
index 04913b8..8f6416c 100644
--- a/src/main/java/org/gcube/portlets/admin/RPTTokenReader.java
+++ b/src/main/java/org/gcube/portlets/admin/RPTTokenReader.java
@@ -63,14 +63,14 @@ public class RPTTokenReader extends MVCPortlet {
 						if (g.getGroupName().equals(PortalContext.getConfiguration().getInfrastructureName())) {
 							String context = gm.getInfrastructureScope(g.getGroupId());
 							userContexts.add(context);
-							if (context.split("/").length == 4){
+							if (context.split("/").length == 4) {
 								vreContexts.add(context);
 							}
 						}
 						if (g.getParentGroupId() > 0) {
 							String context = gm.getInfrastructureScope(g.getGroupId());
 							userContexts.add(context);
-							if (context.split("/").length == 4){
+							if (context.split("/").length == 4) {
 								vreContexts.add(context);
 							}
 						}
@@ -97,7 +97,6 @@ public class RPTTokenReader extends MVCPortlet {
 
 		GroupManager gm = new LiferayGroupManager();
 
-
 		resourceResponse.setContentType("application/json");
 		JSONObject jsonObject = JSONFactoryUtil.createJSONObject();
 
@@ -119,32 +118,22 @@ public class RPTTokenReader extends MVCPortlet {
 			JWTToken authToken = jwtCacheProxy.getOIDCToken(theUser, sessionId);
 
 			// umaToken = OpenIdConnectRESTHelper.queryUMAToken(configuration.getTokenURL(),
-			// 		authToken.getAccessTokenAsBearer(), urlEncodedContext, null);
-
-			// URL auth_url = configuration.getTokenURL();
-			// log.info("auth_url " + auth_url);
-			// log.info("authToken '" + authToken.getAccessTokenString() + "'");
-			// log.info("umaToken " + umaToken.getAccessTokenString());
-			// log.info("context " + context);
-			// log.info("encoded_context " + urlEncodedContext);
-			// log.info("client_id " + configuration.getPortalClientId());
-			// log.info("client_secret " + configuration.getPortalClientSecret());
+			// authToken.getAccessTokenAsBearer(), urlEncodedContext, null);
 
 			Long companyId = PortalUtil.getCompanyId(httpReq);
 
-			String exchangeClientId = PrefsPropsUtil.getString(companyId, "d4science.oidc-token-exchange-dedicated-client-id");
-            String exchangeClientSecret = PrefsPropsUtil.getString(companyId, "d4science.oidc-token-exchange-dedicated-client-secret");
-        
+			String exchangeClientId = PrefsPropsUtil.getString(companyId,
+					"d4science.oidc-token-exchange-dedicated-client-id");
+			String exchangeClientSecret = PrefsPropsUtil.getString(companyId,
+					"d4science.oidc-token-exchange-dedicated-client-secret");
+
 			exchangedToken = OpenIdConnectRESTHelperExtended.ExtendedQueryExchangeToken(
 					configuration.getTokenURL(),
 					authToken.getAccessTokenString(),
 					urlEncodedContext,
 					exchangeClientId,
 					exchangeClientSecret,
-					null
-			);
-			
-			// log.info("exchangedToken " + exchangedToken.getAccessTokenString());
+					null);
 
 			// log.debug("Got a new UMA token " + exchangedToken.getTokenEssentials());
 		} catch (OpenIdConnectRESTHelperException e) {