diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/GetOIDCDiscoveryRemoteOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/GetOIDCDiscoveryRemoteOperation.kt
index 204a939e..9cebcf44 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/GetOIDCDiscoveryRemoteOperation.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/GetOIDCDiscoveryRemoteOperation.kt
@@ -45,8 +45,6 @@ import java.net.URL
 class GetOIDCDiscoveryRemoteOperation : RemoteOperation<OIDCDiscoveryResponse>() {
 
     override fun run(client: OwnCloudClient): RemoteOperationResult<OIDCDiscoveryResponse> {
-        var result: RemoteOperationResult<OIDCDiscoveryResponse>
-
         try {
             val uriBuilder = client.baseUri.buildUpon().apply {
                 appendPath(WELL_KNOWN_PATH)    // avoid starting "/" in this method
@@ -68,22 +66,23 @@ class GetOIDCDiscoveryRemoteOperation : RemoteOperation<OIDCDiscoveryResponse>()
                 val moshi: Moshi = Moshi.Builder().build()
                 val jsonAdapter: JsonAdapter<OIDCDiscoveryResponse> = moshi.adapter(OIDCDiscoveryResponse::class.java)
                 val oidcDiscoveryResponse: OIDCDiscoveryResponse? = jsonAdapter.fromJson(responseBody)
+                Timber.d("Get OIDC Discovery completed and parsed to [$oidcDiscoveryResponse]")
 
-                result = RemoteOperationResult(RemoteOperationResult.ResultCode.OK)
-                result.data = oidcDiscoveryResponse
+                return RemoteOperationResult<OIDCDiscoveryResponse>(RemoteOperationResult.ResultCode.OK).apply {
+                    data = oidcDiscoveryResponse
+                }
 
-                Timber.d("Get OIDC Discovery completed and parsed to $oidcDiscoveryResponse")
             } else {
-                result = RemoteOperationResult(getMethod)
                 Timber.e("Failed response while getting OIDC server discovery from the server status code: $status; response message: $responseBody")
+
+                return RemoteOperationResult<OIDCDiscoveryResponse>(getMethod)
             }
 
         } catch (e: Exception) {
-            result = RemoteOperationResult(e)
             Timber.e(e, "Exception while getting OIDC server discovery")
-        }
 
-        return result
+            return RemoteOperationResult<OIDCDiscoveryResponse>(e)
+        }
     }
 
     companion object {
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/TokenRequestRemoteOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/TokenRequestRemoteOperation.kt
index cd3c9763..67253c4c 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/TokenRequestRemoteOperation.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/oauth/TokenRequestRemoteOperation.kt
@@ -49,8 +49,6 @@ class TokenRequestRemoteOperation(
 ) : RemoteOperation<TokenResponse>() {
 
     override fun run(client: OwnCloudClient): RemoteOperationResult<TokenResponse> {
-        var result: RemoteOperationResult<TokenResponse>
-
         try {
             val requestBody = tokenRequestParams.toRequestBody()
 
@@ -69,21 +67,21 @@ class TokenRequestRemoteOperation(
                 val moshi: Moshi = Moshi.Builder().build()
                 val jsonAdapter: JsonAdapter<TokenResponse> = moshi.adapter(TokenResponse::class.java)
                 val tokenResponse: TokenResponse? = jsonAdapter.fromJson(responseBody)
-
-                result = RemoteOperationResult(RemoteOperationResult.ResultCode.OK)
-                result.data = tokenResponse
-
                 Timber.d("Get tokens completed and parsed to $tokenResponse")
+
+                return RemoteOperationResult<TokenResponse>(RemoteOperationResult.ResultCode.OK).apply {
+                    data = tokenResponse
+                }
+
             } else {
-                result = RemoteOperationResult(postMethod)
                 Timber.e("Failed response while getting tokens from the server status code: $status; response message: $responseBody")
+                return RemoteOperationResult<TokenResponse>(postMethod)
             }
 
         } catch (e: Exception) {
-            result = RemoteOperationResult(e)
             Timber.e(e, "Exception while getting tokens")
-        }
+            return RemoteOperationResult<TokenResponse>(e)
 
-        return result
+        }
     }
 }