diff --git a/app/src/main/java/com/apps/adrcotfas/goodtime/backup/BackupFragment.kt b/app/src/main/java/com/apps/adrcotfas/goodtime/backup/BackupFragment.kt
index 7cb34d1a..f30170c9 100644
--- a/app/src/main/java/com/apps/adrcotfas/goodtime/backup/BackupFragment.kt
+++ b/app/src/main/java/com/apps/adrcotfas/goodtime/backup/BackupFragment.kt
@@ -80,18 +80,18 @@ class BackupFragment : BottomSheetDialogFragment() {
 
     private fun exportCsv() {
         val sessionsLiveData = sessionViewModel.allSessions
-        sessionsLiveData.observe(viewLifecycleOwner, { sessions: List<Session> ->
+        sessionsLiveData.observe(viewLifecycleOwner) { sessions: List<Session> ->
             if (sessions.isEmpty()) {
-                    Toast.makeText(
-                        requireActivity(),
-                        R.string.backup_no_completed_sessions,
-                        Toast.LENGTH_SHORT
-                    ).show()
+                Toast.makeText(
+                    requireActivity(),
+                    R.string.backup_no_completed_sessions,
+                    Toast.LENGTH_SHORT
+                ).show()
                 dismiss()
             } else {
                 BackupOperations.doExportToCSV(lifecycleScope, requireContext(), sessions)
             }
-        })
+        }
     }
 
     companion object {
diff --git a/app/src/main/java/com/apps/adrcotfas/goodtime/statistics/all_sessions/AllSessionsFragment.kt b/app/src/main/java/com/apps/adrcotfas/goodtime/statistics/all_sessions/AllSessionsFragment.kt
index a138e1a7..1d1b7f49 100644
--- a/app/src/main/java/com/apps/adrcotfas/goodtime/statistics/all_sessions/AllSessionsFragment.kt
+++ b/app/src/main/java/com/apps/adrcotfas/goodtime/statistics/all_sessions/AllSessionsFragment.kt
@@ -82,12 +82,12 @@ class AllSessionsFragment : Fragment(), OnLabelSelectedListener {
         val view = binding.root
         mRecyclerView = binding.mainRecylcerView
         mRecyclerView!!.layoutManager = LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
-        labelsViewModel.labels.observe(viewLifecycleOwner, { labels: List<Label> ->
+        labelsViewModel.labels.observe(viewLifecycleOwner) { labels: List<Label> ->
             mAdapter = AllSessionsAdapter(labels)
             mRecyclerView!!.adapter = mAdapter
             labelsViewModel.crtExtendedLabel.observe(
-                viewLifecycleOwner,
-                { refreshCurrentLabel() })
+                viewLifecycleOwner
+            ) { refreshCurrentLabel() }
             mRecyclerView!!.addItemDecoration(
                 DividerItemDecoration(
                     activity, LinearLayoutManager.VERTICAL
@@ -116,45 +116,45 @@ class AllSessionsFragment : Fragment(), OnLabelSelectedListener {
                         }
                     })
             )
-        })
+        }
         return view
     }
 
     private fun refreshCurrentLabel() {
-        if (labelsViewModel!!.crtExtendedLabel.value != null && mAdapter != null) {
-            when (labelsViewModel!!.crtExtendedLabel.value!!.title) {
+        if (labelsViewModel.crtExtendedLabel.value != null && mAdapter != null) {
+            when (labelsViewModel.crtExtendedLabel.value!!.title) {
                 getString(R.string.label_all) -> {
-                    sessionsLiveDataAll.observe(viewLifecycleOwner, { sessions: List<Session> ->
+                    sessionsLiveDataAll.observe(viewLifecycleOwner) { sessions: List<Session> ->
                         sessionsLiveDataUnlabeled.removeObservers(this)
                         sessionsLiveDataCrtLabel.removeObservers(this)
                         mAdapter!!.setData(sessions)
                         mSessions = sessions
                         updateRecyclerViewVisibility()
-                    })
+                    }
                 }
                 "unlabeled" -> {
                     sessionsLiveDataUnlabeled.observe(
-                        viewLifecycleOwner,
-                        { sessions: List<Session> ->
-                            sessionsLiveDataAll.removeObservers(this)
-                            sessionsLiveDataCrtLabel.removeObservers(this)
-                            mAdapter!!.setData(sessions)
-                            mSessions = sessions
-                            updateRecyclerViewVisibility()
-                        })
+                        viewLifecycleOwner
+                    ) { sessions: List<Session> ->
+                        sessionsLiveDataAll.removeObservers(this)
+                        sessionsLiveDataCrtLabel.removeObservers(this)
+                        mAdapter!!.setData(sessions)
+                        mSessions = sessions
+                        updateRecyclerViewVisibility()
+                    }
                 }
                 else -> {
                     sessionsLiveDataCrtLabel =
-                        sessionViewModel!!.getSessions(labelsViewModel!!.crtExtendedLabel.value!!.title)
+                        sessionViewModel.getSessions(labelsViewModel.crtExtendedLabel.value!!.title)
                     sessionsLiveDataCrtLabel.observe(
-                        viewLifecycleOwner,
-                        { sessions: List<Session> ->
-                            sessionsLiveDataAll.removeObservers(this)
-                            sessionsLiveDataUnlabeled.removeObservers(this)
-                            mAdapter!!.setData(sessions)
-                            mSessions = sessions
-                            updateRecyclerViewVisibility()
-                        })
+                        viewLifecycleOwner
+                    ) { sessions: List<Session> ->
+                        sessionsLiveDataAll.removeObservers(this)
+                        sessionsLiveDataUnlabeled.removeObservers(this)
+                        mAdapter!!.setData(sessions)
+                        mSessions = sessions
+                        updateRecyclerViewVisibility()
+                    }
                 }
             }
         }
@@ -188,8 +188,8 @@ class AllSessionsFragment : Fragment(), OnLabelSelectedListener {
             if (mSelectedEntries.size == 1) {
                 val sessionId = mAdapter!!.mSelectedEntries[0]
                 sessionViewModel.getSession(sessionId).observe(
-                    this@AllSessionsFragment,
-                    { session: Session? -> mSessionToEdit = session })
+                    this@AllSessionsFragment
+                ) { session: Session? -> mSessionToEdit = session }
             }
         }
     }