diff --git a/app/src/main/java/com/aurora/store/data/installer/ServiceInstaller.kt b/app/src/main/java/com/aurora/store/data/installer/ServiceInstaller.kt
index 7d3eb42c2..13d012d68 100644
--- a/app/src/main/java/com/aurora/store/data/installer/ServiceInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/ServiceInstaller.kt
@@ -206,7 +206,12 @@ class ServiceInstaller(context: Context) : InstallerBase(context) {
 
         when (returnCode) {
             PackageInstaller.STATUS_SUCCESS -> {
-                EventBus.getDefault().post(InstallerEvent.Success(packageName, this.getString(R.string.installer_status_success)))
+                EventBus.getDefault().post(
+                    InstallerEvent.Success(
+                        packageName,
+                        context.getString(R.string.installer_status_success)
+                    )
+                )
             }
             else -> {
                 val error = AppInstaller.getErrorString(
diff --git a/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt b/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt
index 28ab7d907..709d7cf43 100644
--- a/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt
@@ -28,13 +28,14 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import android.widget.Toast
 import com.aurora.Constants
+import com.aurora.extensions.close
+import com.aurora.extensions.isLAndAbove
+import com.aurora.store.R
 import com.aurora.store.data.event.BusEvent
 import com.aurora.store.databinding.ActivityGoogleBinding
 import com.aurora.store.util.AC2DMTask
-import com.aurora.store.util.Preferences
 import com.aurora.store.util.AC2DMUtil
-import com.aurora.extensions.close
-import com.aurora.extensions.isLAndAbove
+import com.aurora.store.util.Preferences
 import com.aurora.store.view.ui.commons.BaseActivity
 import nl.komponents.kovenant.task
 import org.greenrobot.eventbus.EventBus
@@ -118,14 +119,16 @@ class GoogleActivity : BaseActivity() {
                     EventBus.getDefault().post(BusEvent.GoogleAAS(false))
                 }
             } else {
-                Toast.makeText(this, getString(R.string.toast_aas_token_failed), Toast.LENGTH_LONG).show()
+                Toast.makeText(this, getString(R.string.toast_aas_token_failed), Toast.LENGTH_LONG)
+                    .show()
                 EventBus.getDefault().post(BusEvent.GoogleAAS(false))
             }
 
             //Close Activity
             close()
         } fail {
-            Toast.makeText(this, getString(R.string.toast_aas_token_failed), Toast.LENGTH_LONG).show()
+            Toast.makeText(this, getString(R.string.toast_aas_token_failed), Toast.LENGTH_LONG)
+                .show()
             EventBus.getDefault().post(BusEvent.GoogleAAS(false))
 
             //Close Activity
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseActivity.kt
index 894204c50..548ac4c9c 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseActivity.kt
@@ -23,12 +23,13 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.lifecycle.ViewModelProvider
 import com.aurora.Constants
+import com.aurora.extensions.close
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.data.models.StreamBundle
 import com.aurora.gplayapi.data.models.StreamCluster
+import com.aurora.store.R
 import com.aurora.store.data.ViewState
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.extensions.close
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.controller.CategoryCarouselController
 import com.aurora.store.view.epoxy.controller.GenericCarouselController
@@ -133,7 +134,8 @@ class CategoryBrowseActivity : BaseActivity(), GenericCarouselController.Callbac
         if (streamCluster.clusterBrowseUrl.isNotEmpty())
             openStreamBrowseActivity(streamCluster.clusterBrowseUrl)
         else
-            Toast.makeText(this, getString(R.string.toast_page_unavailable), Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, getString(R.string.toast_page_unavailable), Toast.LENGTH_SHORT)
+                .show()
     }
 
     override fun onClusterScrolled(streamCluster: StreamCluster) {