diff --git a/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt b/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt
index 11ff4d251..75da5b60e 100644
--- a/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt
@@ -72,7 +72,7 @@ class AccountActivity : BaseActivity() {
 
         updateContents()
 
-        VM.liveData.observe(this, {
+        VM.liveData.observe(this) {
             when (it) {
                 AuthState.Valid -> {
 
@@ -101,7 +101,7 @@ class AccountActivity : BaseActivity() {
                     updateStatus(it.status)
                 }
             }
-        })
+        }
     }
 
     override fun onDestroy() {
diff --git a/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt
index c7d835444..b6975b862 100644
--- a/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt
@@ -69,10 +69,10 @@ class InstalledAppsFragment : BaseFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        VM.liveData.observe(viewLifecycleOwner, {
+        VM.liveData.observe(viewLifecycleOwner) {
             updateController(it)
             B.swipeRefreshLayout.isRefreshing = false
-        })
+        }
 
         B.swipeRefreshLayout.setOnRefreshListener {
             VM.observe()
@@ -127,4 +127,4 @@ class InstalledAppsFragment : BaseFragment() {
             AppMenuSheet.TAG
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/aurora/store/view/ui/all/LibraryAppsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/all/LibraryAppsFragment.kt
index 17e66fd77..275ca1311 100644
--- a/app/src/main/java/com/aurora/store/view/ui/all/LibraryAppsFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/all/LibraryAppsFragment.kt
@@ -71,9 +71,9 @@ class LibraryAppsFragment : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         B.swipeRefreshLayout.isEnabled = false
-        VM.liveData.observe(viewLifecycleOwner, {
+        VM.liveData.observe(viewLifecycleOwner) {
             updateController(it)
-        })
+        }
         attachRecycler()
 
         updateController(null)
@@ -127,4 +127,4 @@ class LibraryAppsFragment : BaseFragment() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/aurora/store/view/ui/all/PurchasedAppsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/all/PurchasedAppsFragment.kt
index 1ed3ac004..34b28698d 100644
--- a/app/src/main/java/com/aurora/store/view/ui/all/PurchasedAppsFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/all/PurchasedAppsFragment.kt
@@ -72,10 +72,10 @@ class PurchasedAppsFragment : BaseFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        VM.liveData.observe(viewLifecycleOwner, {
+        VM.liveData.observe(viewLifecycleOwner) {
             updateController(it)
             B.swipeRefreshLayout.isRefreshing = false
-        })
+        }
 
         B.swipeRefreshLayout.setOnRefreshListener {
             VM.observe()
@@ -142,4 +142,4 @@ class PurchasedAppsFragment : BaseFragment() {
             AppMenuSheet.TAG
         )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/aurora/store/view/ui/apps/TopChartFragment.kt b/app/src/main/java/com/aurora/store/view/ui/apps/TopChartFragment.kt
index f9f24e02c..5f1cbdbe9 100644
--- a/app/src/main/java/com/aurora/store/view/ui/apps/TopChartFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/apps/TopChartFragment.kt
@@ -89,14 +89,14 @@ class TopChartFragment : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        VM.liveData.observe(viewLifecycleOwner, {
+        VM.liveData.observe(viewLifecycleOwner) {
             if (!::streamCluster.isInitialized)
                 attachRecycler()
 
             streamCluster = it
 
             updateController(streamCluster)
-        })
+        }
 
         updateController(null)
     }
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt
index 54338050f..27b8635bc 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt
@@ -58,11 +58,11 @@ class BlacklistActivity : BaseActivity() {
 
         setContentView(B.root)
 
-        VM.liveData.observe(this, {
+        VM.liveData.observe(this) {
             updateController(it.sortedByDescending { app ->
                 blacklistProvider.isBlacklisted(app.packageName)
             })
-        })
+        }
 
         attachToolbar()
 
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 a2010b0d8..9b18cba7c 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
@@ -96,7 +96,7 @@ class CategoryBrowseActivity : BaseActivity(), GenericCarouselController.Callbac
 
         B.recycler.setController(C)
 
-        VM.liveData.observe(this, {
+        VM.liveData.observe(this) {
             when (it) {
                 is ViewState.Empty -> {
                 }
@@ -111,7 +111,7 @@ class CategoryBrowseActivity : BaseActivity(), GenericCarouselController.Callbac
                 }
                 else -> {}
             }
-        })
+        }
 
         endlessRecyclerOnScrollListener =
             object : EndlessRecyclerOnScrollListener() {
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryFragment.kt
index 3fca829f3..0d5eb5e4d 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryFragment.kt
@@ -80,9 +80,9 @@ class CategoryFragment : BaseFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        VM.liveData.observe(viewLifecycleOwner, {
+        VM.liveData.observe(viewLifecycleOwner) {
             updateController(it)
-        })
+        }
     }
 
     private fun updateController(categoryList: List<Category>) {
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/EarlyAccessFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/EarlyAccessFragment.kt
index 64eb91293..a85edad3b 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/EarlyAccessFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/EarlyAccessFragment.kt
@@ -92,7 +92,7 @@ class EarlyAccessFragment : BaseFragment(), GenericCarouselController.Callbacks
 
         B.recycler.setController(C)
 
-        VM.liveData.observe(viewLifecycleOwner, {
+        VM.liveData.observe(viewLifecycleOwner) {
             when (it) {
                 is ViewState.Empty -> {
                 }
@@ -107,7 +107,7 @@ class EarlyAccessFragment : BaseFragment(), GenericCarouselController.Callbacks
 
                 }
             }
-        })
+        }
 
         B.recycler.addOnScrollListener(object : EndlessRecyclerOnScrollListener() {
             override fun onLoadMore(currentPage: Int) {
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/EditorChoiceFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/EditorChoiceFragment.kt
index bf8ef0338..4ecc92726 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/EditorChoiceFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/EditorChoiceFragment.kt
@@ -86,9 +86,9 @@ class EditorChoiceFragment : BaseFragment(), EditorChoiceController.Callbacks {
 
         B.recycler.setController(C)
 
-        VM.liveData.observe(viewLifecycleOwner, {
+        VM.liveData.observe(viewLifecycleOwner) {
             updateController(it)
-        })
+        }
     }
 
     private fun updateController(editorChoiceBundles: List<EditorChoiceBundle>) {
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseActivity.kt
index eaf638d30..5ccc3c66e 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseActivity.kt
@@ -64,9 +64,9 @@ class EditorStreamBrowseActivity : BaseActivity() {
 
         attachToolbar()
 
-        VM.liveData.observe(this, {
+        VM.liveData.observe(this) {
             updateController(it)
-        })
+        }
 
         intent.apply {
             getStringExtra(Constants.BROWSE_EXTRA)?.let {
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseActivity.kt
index 0a3097054..6e38b7800 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseActivity.kt
@@ -68,7 +68,7 @@ class ExpandedStreamBrowseActivity : BaseActivity() {
 
         attachToolbar()
 
-        VM.liveData.observe(this, {
+        VM.liveData.observe(this) {
             if (!::cluster.isInitialized)
                 attachRecycler()
 
@@ -76,7 +76,7 @@ class ExpandedStreamBrowseActivity : BaseActivity() {
 
             updateController(cluster)
             updateTitle(cluster)
-        })
+        }
 
         intent.apply {
             getStringExtra(Constants.BROWSE_EXTRA)?.let {
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/ForYouFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/ForYouFragment.kt
index 8341a4ae8..9f16b73b1 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/ForYouFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/ForYouFragment.kt
@@ -96,7 +96,7 @@ class ForYouFragment : BaseFragment(), GenericCarouselController.Callbacks {
 
         B.recycler.setController(C)
 
-        VM.liveData.observe(viewLifecycleOwner, {
+        VM.liveData.observe(viewLifecycleOwner) {
             when (it) {
                 is ViewState.Empty -> {
                 }
@@ -118,7 +118,7 @@ class ForYouFragment : BaseFragment(), GenericCarouselController.Callbacks {
                     updateController(streamBundle)
                 }
             }
-        })
+        }
     }
 
     private fun attachRecycler() {
@@ -152,4 +152,4 @@ class ForYouFragment : BaseFragment(), GenericCarouselController.Callbacks {
     override fun onAppLongClick(app: App) {
 
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseActivity.kt
index 2fc231bbc..d8feecc2c 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseActivity.kt
@@ -65,7 +65,7 @@ class StreamBrowseActivity : BaseActivity() {
 
         attachToolbar()
 
-        VM.liveData.observe(this, {
+        VM.liveData.observe(this) {
             if (!::cluster.isInitialized)
                 attachRecycler()
 
@@ -73,7 +73,7 @@ class StreamBrowseActivity : BaseActivity() {
 
             updateController(cluster)
             updateTitle(cluster)
-        })
+        }
 
         intent.apply {
             getStringExtra(Constants.BROWSE_EXTRA)?.let {
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt
index 2d75158e3..3e8bd057b 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt
@@ -316,7 +316,7 @@ abstract class BaseDetailsActivity : BaseActivity() {
                     }
                 })
 
-            VM.liveData.observe(this, {
+            VM.liveData.observe(this) {
                 when (it) {
                     is ViewState.Empty -> {
                     }
@@ -333,7 +333,7 @@ abstract class BaseDetailsActivity : BaseActivity() {
                         carouselController.setData(it.data as StreamBundle)
                     }
                 }
-            })
+            }
 
             epoxyRecyclerView.setController(carouselController)
 
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewActivity.kt
index c57b6fe4e..fd0a9457d 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewActivity.kt
@@ -64,7 +64,7 @@ class DetailsReviewActivity : BaseActivity() {
 
         setContentView(B.root)
 
-        VM.liveData.observe(this, {
+        VM.liveData.observe(this) {
             if (!::reviewCluster.isInitialized) {
                 attachRecycler()
             }
@@ -73,7 +73,7 @@ class DetailsReviewActivity : BaseActivity() {
                 reviewCluster = it
                 updateController(reviewCluster)
             }
-        })
+        }
 
         attachChips()
 
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DevAppsActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/DevAppsActivity.kt
index 32c2306aa..c21aa13f0 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DevAppsActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DevAppsActivity.kt
@@ -63,10 +63,10 @@ class DevAppsActivity : BaseActivity() {
 
         setContentView(B.root)
 
-        VM.liveData.observe(this, {
+        VM.liveData.observe(this) {
             searchBundle = it
             updateController(searchBundle)
-        })
+        }
 
         attachRecycler()
 
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DevProfileActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/DevProfileActivity.kt
index 47d3aeb03..a8d7b4716 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DevProfileActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DevProfileActivity.kt
@@ -69,7 +69,7 @@ class DevProfileActivity : BaseActivity(), GenericCarouselController.Callbacks {
         attachToolbar()
         attachRecycler()
 
-        VM.liveData.observe(this, {
+        VM.liveData.observe(this) {
             when (it) {
                 is ViewState.Empty -> {
                 }
@@ -87,7 +87,7 @@ class DevProfileActivity : BaseActivity(), GenericCarouselController.Callbacks {
                     updateController(it.data)
                 }
             }
-        })
+        }
 
         B.viewFlipper.displayedChild = 1
 
diff --git a/app/src/main/java/com/aurora/store/view/ui/games/TopChartFragment.kt b/app/src/main/java/com/aurora/store/view/ui/games/TopChartFragment.kt
index 0eaf30be6..c978eb328 100644
--- a/app/src/main/java/com/aurora/store/view/ui/games/TopChartFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/games/TopChartFragment.kt
@@ -106,9 +106,9 @@ class TopChartFragment : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        VM.liveData.observe(viewLifecycleOwner, {
+        VM.liveData.observe(viewLifecycleOwner) {
             updateController(it)
-        })
+        }
 
         B.recycler.addOnScrollListener(object : EndlessRecyclerOnScrollListener() {
             override fun onLoadMore(currentPage: Int) {
@@ -148,4 +148,4 @@ class TopChartFragment : BaseFragment() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt b/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt
index 2b095cd07..a9b257bfa 100644
--- a/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt
@@ -79,7 +79,7 @@ class SplashActivity : BaseActivity() {
         //Initial status
         updateStatus(getString(R.string.session_init))
 
-        VM.liveData.observe(this, {
+        VM.liveData.observe(this) {
             when (it) {
                 AuthState.Valid -> {
                     moveToContent()
@@ -108,7 +108,7 @@ class SplashActivity : BaseActivity() {
                     updateStatus(it.status)
                 }
             }
-        })
+        }
     }
 
     override fun onResume() {