diff --git a/app/src/main/java/com/aurora/store/util/AC2DMTask.kt b/app/src/main/java/com/aurora/store/util/AC2DMTask.kt
index e23159900..2f0b6440a 100644
--- a/app/src/main/java/com/aurora/store/util/AC2DMTask.kt
+++ b/app/src/main/java/com/aurora/store/util/AC2DMTask.kt
@@ -21,7 +21,7 @@ package com.aurora.store.util
 
 import com.aurora.store.data.network.OkHttpClient
 import okhttp3.RequestBody.Companion.toRequestBody
-import java.util.*
+import java.util.Locale
 
 class AC2DMTask {
     @Throws(Exception::class)
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/TopChartFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/TopChartFragment.kt
index d1f542efb..a70b5aa73 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/TopChartFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/TopChartFragment.kt
@@ -26,7 +26,6 @@ import com.aurora.Constants
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.gplayapi.helpers.contracts.TopChartsContract.Chart
 import com.aurora.gplayapi.helpers.contracts.TopChartsContract.Type
-import com.aurora.store.R
 import com.aurora.store.TopChartStash
 import com.aurora.store.data.model.ViewState
 import com.aurora.store.data.model.ViewState.Empty.getDataAs
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewFragment.kt
index dd4957c0f..18aa817c0 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewFragment.kt
@@ -21,7 +21,6 @@ package com.aurora.store.view.ui.details
 
 import android.os.Bundle
 import android.view.View
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/ScreenshotFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/ScreenshotFragment.kt
index a80868105..628280d11 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/ScreenshotFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/ScreenshotFragment.kt
@@ -22,7 +22,6 @@ package com.aurora.store.view.ui.details
 import android.os.Bundle
 import android.view.View
 import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.LinearLayoutManager
diff --git a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
index 523cc2bee..f97c0a103 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt
@@ -33,8 +33,8 @@ import com.aurora.store.AuroraApp
 import com.aurora.store.R
 import com.aurora.store.data.event.AuthEvent
 import com.aurora.store.data.model.AccountType
-import com.aurora.store.data.model.AuthState
 import com.aurora.store.data.model.Auth
+import com.aurora.store.data.model.AuthState
 import com.aurora.store.data.network.HttpClient
 import com.aurora.store.data.providers.AccountProvider
 import com.aurora.store.data.providers.AuthProvider
@@ -52,7 +52,8 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
 import java.net.ConnectException
 import java.net.UnknownHostException
-import java.util.*
+import java.util.Locale
+import java.util.Properties
 import javax.inject.Inject
 
 @HiltViewModel