diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/MicroGScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/MicroGScreen.kt
index 5228f2582..95af7c428 100644
--- a/app/src/main/java/com/aurora/store/compose/ui/details/MicroGScreen.kt
+++ b/app/src/main/java/com/aurora/store/compose/ui/details/MicroGScreen.kt
@@ -57,7 +57,7 @@ fun MicroGScreen(
     val app by appDetailsViewModel.app.collectAsStateWithLifecycle()
     val topAppBarTitle = when {
         windowAdaptiveInfo.isWindowCompact -> app!!.displayName
-        else                               -> stringResource(R.string.onboarding_title_gsf)
+        else -> stringResource(R.string.onboarding_title_gsf)
     }
 
     ScreenContent(
diff --git a/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt
index a263a4def..53cf8a5cb 100644
--- a/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt
+++ b/app/src/main/java/com/aurora/store/compose/ui/onboarding/OnboardingScreen.kt
@@ -79,7 +79,7 @@ private fun ScreenContent(
     fun SetupActions(uiState: OnboardingUiState) {
         val horizontalButtonPadding = when {
             windowAdaptiveInfo.isWindowCompact -> dimensionResource(R.dimen.padding_medium)
-            else                               -> dimensionResource(R.dimen.padding_xlarge)
+            else -> dimensionResource(R.dimen.padding_xlarge)
         }
 
         Row(
@@ -97,14 +97,14 @@ private fun ScreenContent(
         ) {
             val buttonWidthModifier = when {
                 windowAdaptiveInfo.isWindowCompact -> Modifier.weight(1F)
-                else                               -> Modifier.widthIn(min = dimensionResource(R.dimen.width_button))
+                else -> Modifier.widthIn(min = dimensionResource(R.dimen.width_button))
             }
 
             TextButton(
                 modifier = buttonWidthModifier,
                 onClick = {
                     when (pagerState.currentPage) {
-                        0    -> onFinishOnboarding()
+                        0 -> onFinishOnboarding()
                         else -> {
                             coroutineScope.launch {
                                 pagerState.animateScrollToPage(pagerState.currentPage - 1)
@@ -115,7 +115,7 @@ private fun ScreenContent(
             ) {
                 Text(
                     text = when (pagerState.currentPage) {
-                        0    -> stringResource(R.string.action_skip)
+                        0 -> stringResource(R.string.action_skip)
                         else -> stringResource(R.string.action_back)
                     },
                     maxLines = 1,
@@ -129,7 +129,7 @@ private fun ScreenContent(
                 onClick = {
                     when {
                         isFinalPage() -> onFinishOnboarding()
-                        else          -> {
+                        else -> {
                             coroutineScope.launch {
                                 pagerState.animateScrollToPage(pagerState.currentPage + 1)
                             }
@@ -140,7 +140,7 @@ private fun ScreenContent(
                 Text(
                     text = when {
                         isFinalPage() -> stringResource(R.string.action_finish)
-                        else          -> stringResource(R.string.action_next)
+                        else -> stringResource(R.string.action_next)
                     },
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis
@@ -181,9 +181,9 @@ private fun ScreenContent(
                     verticalAlignment = Alignment.Top
                 ) { page ->
                     when (pages[page]) {
-                        OnboardingPage.WELCOME     -> WelcomePage()
+                        OnboardingPage.WELCOME -> WelcomePage()
                         OnboardingPage.PERMISSIONS -> PermissionsPage()
-                        OnboardingPage.MICRO_G     -> MicroGPage(onMicrogTOSChecked = onMicrogTOSChecked)
+                        OnboardingPage.MICRO_G -> MicroGPage(onMicrogTOSChecked = onMicrogTOSChecked)
                     }
                 }
             }
diff --git a/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt b/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt
index a2621126f..55dda1168 100644
--- a/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt
+++ b/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt
@@ -21,7 +21,6 @@ import androidx.work.WorkInfo.Companion.STOP_REASON_USER
 import androidx.work.WorkerParameters
 import com.aurora.Constants.FLAVOUR_HUAWEI
 import com.aurora.extensions.copyTo
-import com.aurora.extensions.isHuawei
 import com.aurora.extensions.isPAndAbove
 import com.aurora.extensions.isQAndAbove
 import com.aurora.extensions.isSAndAbove
@@ -43,7 +42,6 @@ import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.data.room.download.Download
 import com.aurora.store.data.room.download.DownloadDao
 import com.aurora.store.util.CertUtil
-import com.aurora.store.util.FlavouredUtil
 import com.aurora.store.util.NotificationUtil
 import com.aurora.store.util.PackageUtil
 import com.aurora.store.util.PathUtil
@@ -231,7 +229,7 @@ class DownloadWorker @AssistedInject constructor(
                         notifyStatus(DownloadStatus.CANCELLED)
                     }
 
-                    else                          -> {
+                    else -> {
                         notifyStatus(status = DownloadStatus.FAILED, exception = exception)
                         AuroraApp.events.send(
                             InstallerEvent.Failed(
@@ -421,7 +419,7 @@ class DownloadWorker @AssistedInject constructor(
                 downloadDao.updateProgress(download.packageName, 100, 0, 0)
             }
 
-            else                     -> {}
+            else -> {}
         }
 
         val notification = NotificationUtil.getDownloadNotification(