diff --git a/app/src/androidTest/java/com/aurora/store/HiltInstrumentationTestRunner.kt b/app/src/androidTest/java/com/aurora/store/HiltInstrumentationTestRunner.kt
index ad018c84c..a720021cc 100644
--- a/app/src/androidTest/java/com/aurora/store/HiltInstrumentationTestRunner.kt
+++ b/app/src/androidTest/java/com/aurora/store/HiltInstrumentationTestRunner.kt
@@ -5,13 +5,11 @@ import android.content.Context
 import androidx.test.runner.AndroidJUnitRunner
 import dagger.hilt.android.testing.HiltTestApplication
 
-class HiltInstrumentationTestRunner: AndroidJUnitRunner() {
+class HiltInstrumentationTestRunner : AndroidJUnitRunner() {
 
     override fun newApplication(
         cl: ClassLoader?,
         className: String?,
         context: Context?
-    ): Application {
-        return super.newApplication(cl, HiltTestApplication::class.java.name, context)
-    }
+    ): Application = super.newApplication(cl, HiltTestApplication::class.java.name, context)
 }
diff --git a/app/src/androidTest/java/com/aurora/store/compose/composable/InfoTest.kt b/app/src/androidTest/java/com/aurora/store/compose/composable/InfoTest.kt
index 134c985b9..da51e9292 100644
--- a/app/src/androidTest/java/com/aurora/store/compose/composable/InfoTest.kt
+++ b/app/src/androidTest/java/com/aurora/store/compose/composable/InfoTest.kt
@@ -15,7 +15,7 @@ import com.aurora.store.IsolatedTest
 import com.aurora.store.R
 import org.junit.Test
 
-class InfoTest: IsolatedTest() {
+class InfoTest : IsolatedTest() {
 
     @Test
     fun testInfoWithoutClickHandling() {
diff --git a/app/src/androidTest/java/com/aurora/store/compose/composable/PermissionListItemTest.kt b/app/src/androidTest/java/com/aurora/store/compose/composable/PermissionListItemTest.kt
index 632662a57..b0ff0e7fd 100644
--- a/app/src/androidTest/java/com/aurora/store/compose/composable/PermissionListItemTest.kt
+++ b/app/src/androidTest/java/com/aurora/store/compose/composable/PermissionListItemTest.kt
@@ -24,7 +24,7 @@ class PermissionListItemTest : IsolatedTest() {
         get() = Permission(
             PermissionType.STORAGE_MANAGER,
             stringResource(R.string.onboarding_permission_esm),
-            stringResource(R.string.onboarding_permission_esa_desc),
+            stringResource(R.string.onboarding_permission_esa_desc)
         )
 
     @Test
diff --git a/app/src/androidTest/java/com/aurora/store/compose/composable/app/AnimatedAppIconTest.kt b/app/src/androidTest/java/com/aurora/store/compose/composable/app/AnimatedAppIconTest.kt
index 86743e71d..c0dad41fe 100644
--- a/app/src/androidTest/java/com/aurora/store/compose/composable/app/AnimatedAppIconTest.kt
+++ b/app/src/androidTest/java/com/aurora/store/compose/composable/app/AnimatedAppIconTest.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.test.onNodeWithTag
 import com.aurora.store.IsolatedTest
 import org.junit.Test
 
-class AnimatedAppIconTest: IsolatedTest() {
+class AnimatedAppIconTest : IsolatedTest() {
 
     @Test
     fun testAnimatedAppIconNoProgress() {
diff --git a/app/src/huawei/java/com/aurora/store/data/receiver/InstallerStatusReceiver.kt b/app/src/huawei/java/com/aurora/store/data/receiver/InstallerStatusReceiver.kt
index a7e0d64fd..1044e242f 100644
--- a/app/src/huawei/java/com/aurora/store/data/receiver/InstallerStatusReceiver.kt
+++ b/app/src/huawei/java/com/aurora/store/data/receiver/InstallerStatusReceiver.kt
@@ -144,19 +144,17 @@ class InstallerStatusReceiver : BaseInstallerStatusReceiver() {
         }
     }
 
-    private fun isHuaweiSilentInstallSupported(context: Context): Boolean {
-        return try {
-            val applicationInfo: ApplicationInfo = context.packageManager.getApplicationInfo(
-                PACKAGE_NAME_APP_GALLERY,
-                PackageManager.GET_META_DATA
-            )
+    private fun isHuaweiSilentInstallSupported(context: Context): Boolean = try {
+        val applicationInfo: ApplicationInfo = context.packageManager.getApplicationInfo(
+            PACKAGE_NAME_APP_GALLERY,
+            PackageManager.GET_META_DATA
+        )
 
-            val supportFunction = applicationInfo.metaData.getInt("appgallery_support_function")
-            Log.i(TAG, "Huawei silent install support function: $supportFunction")
+        val supportFunction = applicationInfo.metaData.getInt("appgallery_support_function")
+        Log.i(TAG, "Huawei silent install support function: $supportFunction")
 
-            (supportFunction and (1 shl 5)) != 0
-        } catch (e: Exception) {
-            false
-        }
+        (supportFunction and (1 shl 5)) != 0
+    } catch (e: Exception) {
+        false
     }
 }
diff --git a/app/src/huawei/java/com/aurora/store/util/FlavouredUtil.kt b/app/src/huawei/java/com/aurora/store/util/FlavouredUtil.kt
index 520725f9a..0a3a8d67e 100644
--- a/app/src/huawei/java/com/aurora/store/util/FlavouredUtil.kt
+++ b/app/src/huawei/java/com/aurora/store/util/FlavouredUtil.kt
@@ -7,9 +7,7 @@ object FlavouredUtil : IFlavouredUtil {
 
     override val defaultDispensers: Set<String> = emptySet()
 
-    override fun promptMicroGInstall(context: Context): Boolean {
-        return isHuawei &&
-                PackageUtil.hasSupportedAppGallery(context) &&
-                !PackageUtil.isMicroGBundleInstalled(context)
-    }
+    override fun promptMicroGInstall(context: Context): Boolean = isHuawei &&
+        PackageUtil.hasSupportedAppGallery(context) &&
+        !PackageUtil.isMicroGBundleInstalled(context)
 }
diff --git a/app/src/preload/java/com/aurora/store/util/FlavouredUtil.kt b/app/src/preload/java/com/aurora/store/util/FlavouredUtil.kt
index 94d91d052..111b72ea7 100644
--- a/app/src/preload/java/com/aurora/store/util/FlavouredUtil.kt
+++ b/app/src/preload/java/com/aurora/store/util/FlavouredUtil.kt
@@ -6,7 +6,5 @@ object FlavouredUtil : IFlavouredUtil {
 
     override val defaultDispensers = setOf(Constants.URL_DISPENSER)
 
-    override fun promptMicroGInstall(context: Context): Boolean {
-        return false
-    }
+    override fun promptMicroGInstall(context: Context): Boolean = false
 }
diff --git a/app/src/vanilla/java/com/aurora/store/util/FlavouredUtil.kt b/app/src/vanilla/java/com/aurora/store/util/FlavouredUtil.kt
index eae8d4c20..e92b09b7d 100644
--- a/app/src/vanilla/java/com/aurora/store/util/FlavouredUtil.kt
+++ b/app/src/vanilla/java/com/aurora/store/util/FlavouredUtil.kt
@@ -7,7 +7,5 @@ object FlavouredUtil : IFlavouredUtil {
 
     override val defaultDispensers = setOf(Constants.URL_DISPENSER)
 
-    override fun promptMicroGInstall(context: Context): Boolean {
-        return false
-    }
+    override fun promptMicroGInstall(context: Context): Boolean = false
 }