diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
index 462c0cd638..362ebcec26 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
@@ -25,32 +25,26 @@ import java.io.IOException
 import java.net.UnknownHostException
 import javax.net.ssl.HttpsURLConnection
 
-fun Throwable.is401() =
-        this is Failure.ServerError &&
-                httpCode == HttpsURLConnection.HTTP_UNAUTHORIZED && /* 401 */
-                error.code == MatrixError.M_UNAUTHORIZED
+fun Throwable.is401() = this is Failure.ServerError &&
+        httpCode == HttpsURLConnection.HTTP_UNAUTHORIZED && /* 401 */
+        error.code == MatrixError.M_UNAUTHORIZED
 
-fun Throwable.is404() =
-        this is Failure.ServerError &&
-                httpCode == HttpsURLConnection.HTTP_NOT_FOUND && /* 404 */
-                error.code == MatrixError.M_NOT_FOUND
+fun Throwable.is404() = this is Failure.ServerError &&
+        httpCode == HttpsURLConnection.HTTP_NOT_FOUND && /* 404 */
+        error.code == MatrixError.M_NOT_FOUND
 
-fun Throwable.isTokenError() =
-        this is Failure.ServerError &&
-                (error.code == MatrixError.M_UNKNOWN_TOKEN ||
-                        error.code == MatrixError.M_MISSING_TOKEN ||
-                        error.code == MatrixError.ORG_MATRIX_EXPIRED_ACCOUNT)
+fun Throwable.isTokenError() = this is Failure.ServerError &&
+        (error.code == MatrixError.M_UNKNOWN_TOKEN ||
+                error.code == MatrixError.M_MISSING_TOKEN ||
+                error.code == MatrixError.ORG_MATRIX_EXPIRED_ACCOUNT)
 
-fun Throwable.isLimitExceededError() =
-        this is Failure.ServerError &&
-                httpCode == 429 &&
-                error.code == MatrixError.M_LIMIT_EXCEEDED
+fun Throwable.isLimitExceededError() = this is Failure.ServerError &&
+        httpCode == 429 &&
+        error.code == MatrixError.M_LIMIT_EXCEEDED
 
-fun Throwable.shouldBeRetried(): Boolean {
-    return this is Failure.NetworkConnection ||
-            this is IOException ||
-            this.isLimitExceededError()
-}
+fun Throwable.shouldBeRetried() = this is Failure.NetworkConnection ||
+        this is IOException ||
+        isLimitExceededError()
 
 /**
  * Get the retry delay in case of rate limit exceeded error, adding 100 ms, of defaultValue otherwise
@@ -64,46 +58,33 @@ fun Throwable.getRetryDelay(defaultValue: Long): Long {
             ?: defaultValue
 }
 
-fun Throwable.isUsernameInUse(): Boolean {
-    return this is Failure.ServerError && error.code == MatrixError.M_USER_IN_USE
-}
+fun Throwable.isUsernameInUse() = this is Failure.ServerError &&
+        error.code == MatrixError.M_USER_IN_USE
 
-fun Throwable.isInvalidUsername(): Boolean {
-    return this is Failure.ServerError &&
-            error.code == MatrixError.M_INVALID_USERNAME
-}
+fun Throwable.isInvalidUsername() = this is Failure.ServerError &&
+        error.code == MatrixError.M_INVALID_USERNAME
 
-fun Throwable.isInvalidPassword(): Boolean {
-    return this is Failure.ServerError &&
-            error.code == MatrixError.M_FORBIDDEN &&
-            error.message == "Invalid password"
-}
+fun Throwable.isInvalidPassword() = this is Failure.ServerError &&
+        error.code == MatrixError.M_FORBIDDEN &&
+        error.message == "Invalid password"
 
-fun Throwable.isRegistrationDisabled(): Boolean {
-    return this is Failure.ServerError && error.code == MatrixError.M_FORBIDDEN &&
-            httpCode == HttpsURLConnection.HTTP_FORBIDDEN
-}
+fun Throwable.isRegistrationDisabled() = this is Failure.ServerError &&
+        error.code == MatrixError.M_FORBIDDEN &&
+        httpCode == HttpsURLConnection.HTTP_FORBIDDEN
 
-fun Throwable.isWeakPassword(): Boolean {
-    return this is Failure.ServerError && error.code == MatrixError.M_WEAK_PASSWORD
-}
+fun Throwable.isWeakPassword() = this is Failure.ServerError &&
+        error.code == MatrixError.M_WEAK_PASSWORD
 
-fun Throwable.isLoginEmailUnknown(): Boolean {
-    return this is Failure.ServerError &&
-            error.code == MatrixError.M_FORBIDDEN &&
-            error.message.isEmpty()
-}
+fun Throwable.isLoginEmailUnknown() = this is Failure.ServerError &&
+        error.code == MatrixError.M_FORBIDDEN &&
+        error.message.isEmpty()
 
-fun Throwable.isInvalidUIAAuth(): Boolean {
-    return this is Failure.ServerError &&
-            error.code == MatrixError.M_FORBIDDEN &&
-            error.flows != null
-}
+fun Throwable.isInvalidUIAAuth() = this is Failure.ServerError &&
+        error.code == MatrixError.M_FORBIDDEN &&
+        error.flows != null
 
-fun Throwable.isHomeserverUnavailable(): Boolean {
-    return this is Failure.NetworkConnection &&
-            this.ioException is UnknownHostException
-}
+fun Throwable.isHomeserverUnavailable() = this is Failure.NetworkConnection &&
+        this.ioException is UnknownHostException
 
 /**
  * Try to convert to a RegistrationFlowResponse. Return null in the cases it's not possible
@@ -135,13 +116,11 @@ fun Throwable.toRegistrationFlowResponse(): RegistrationFlowResponse? {
     }
 }
 
-fun Throwable.isRegistrationAvailabilityError(): Boolean {
-    return this is Failure.ServerError &&
-            httpCode == HttpsURLConnection.HTTP_BAD_REQUEST && /* 400 */
-            (error.code == MatrixError.M_USER_IN_USE ||
-                    error.code == MatrixError.M_INVALID_USERNAME ||
-                    error.code == MatrixError.M_EXCLUSIVE)
-}
+fun Throwable.isRegistrationAvailabilityError() = this is Failure.ServerError &&
+        httpCode == HttpsURLConnection.HTTP_BAD_REQUEST && /* 400 */
+        (error.code == MatrixError.M_USER_IN_USE ||
+                error.code == MatrixError.M_INVALID_USERNAME ||
+                error.code == MatrixError.M_EXCLUSIVE)
 
 /**
  * Try to convert to a ScanFailure. Return null in the cases it's not possible