diff --git a/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt b/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt
index 23f376c8c5..94f76ac3e3 100644
--- a/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt
+++ b/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt
@@ -30,10 +30,7 @@ import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
 import android.provider.MediaStore
 import android.text.format.Formatter
-import android.transition.AutoTransition
-import android.transition.TransitionManager
-import android.transition.TransitionSet
-import android.util.DisplayMetrics
+import android.transition.*
 import android.util.Patterns
 import android.view.ViewGroup
 import android.view.animation.Animation
@@ -46,7 +43,7 @@ import androidx.core.view.children
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.Lifecycle.*
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
@@ -405,7 +402,8 @@ fun LayoutSwitchDriveBinding.setDriveHeader(currentDrive: Drive) {
 }
 
 fun LayoutSwitchDriveBinding.setupSwitchDriveButton(fragment: Fragment) {
-    AccountUtils.getCurrentDrive()?.let { setDriveHeader(it) }
+
+    AccountUtils.getCurrentDrive()?.let(::setDriveHeader)
 
     if (DriveInfosController.hasSingleDrive(AccountUtils.currentUserId)) {
         switchDriveButton.apply {
@@ -418,8 +416,8 @@ fun LayoutSwitchDriveBinding.setupSwitchDriveButton(fragment: Fragment) {
 
     fragment.viewLifecycleOwner.lifecycle.addObserver(
         object : LifecycleEventObserver {
-            override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
-                if (event == Lifecycle.Event.ON_RESUME) AccountUtils.getCurrentDrive()?.let { setDriveHeader(it) }
+            override fun onStateChanged(source: LifecycleOwner, event: Event) {
+                if (event == Event.ON_RESUME) AccountUtils.getCurrentDrive()?.let(::setDriveHeader)
             }
         },
     )