diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt
index 21d513283..7840194b8 100644
--- a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt
+++ b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt
@@ -11,6 +11,7 @@ import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
+import androidx.core.net.toUri
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.components.XAxis.XAxisPosition
 import com.github.mikephil.charting.data.BarData
@@ -22,9 +23,8 @@ import com.github.mikephil.charting.interfaces.datasets.IBarDataSet
 import com.github.mikephil.charting.listener.OnChartValueSelectedListener
 import com.github.mikephil.charting.utils.MPPointF
 import info.appdev.chartexample.DataTools.Companion.getValues
-import info.appdev.chartexample.notimportant.DemoBase
-import androidx.core.net.toUri
 import info.appdev.chartexample.databinding.ActivityHorizontalbarchartBinding
+import info.appdev.chartexample.notimportant.DemoBase
 import timber.log.Timber
 
 class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener {
@@ -115,10 +115,10 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV
         val set1: BarDataSet
 
         if (binding.chart1.data != null &&
-            binding.chart1.data!!.getDataSetCount() > 0
+            binding.chart1.data!!.dataSetCount > 0
         ) {
             set1 = binding.chart1.data!!.getDataSetByIndex(0) as BarDataSet
-            set1.entries  = values
+            set1.entries = values
             binding.chart1.data!!.notifyDataChanged()
             binding.chart1.notifyDataSetChanged()
         } else {
@@ -152,26 +152,22 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV
             }
 
             R.id.actionToggleValues -> {
-                binding.chart1.data!!.dataSets.forEach {
-                    it?.isDrawValues = !it.isDrawValues
+                binding.chart1.data?.dataSets?.forEach {
+                    it.isDrawValues = !it.isDrawValues
                 }
                 binding.chart1.invalidate()
             }
 
             R.id.actionToggleIcons -> {
-                val sets = binding.chart1.data!!
-                    .dataSets
-
-                for (iSet in sets) {
-                    iSet.isDrawIcons = !iSet.isDrawIcons
+                binding.chart1.data?.dataSets?.forEach { set ->
+                    set.isDrawIcons = !set.isDrawIcons
                 }
-
                 binding.chart1.invalidate()
             }
 
             R.id.actionToggleHighlight -> {
-                if (binding.chart1.data != null) {
-                    binding.chart1.data!!.isHighlightEnabled = !binding.chart1.data!!.isHighlightEnabled()
+                binding.chart1.data?.let { data ->
+                    data.isHighlightEnabled = !data.isHighlightEnabled
                     binding.chart1.invalidate()
                 }
             }
@@ -188,8 +184,9 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV
             }
 
             R.id.actionToggleBarBorders -> {
-                for (set in binding.chart1.data!!.dataSets) (set as BarDataSet).barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
-
+                binding.chart1.data?.dataSets?.forEach { set ->
+                    (set as BarDataSet).barBorderWidth = if (set.barBorderWidth == 1f) 0f else 1f
+                }
                 binding.chart1.invalidate()
             }
 
@@ -240,8 +237,7 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV
         binding.chart1.getBarBounds(entry as BarEntry, bounds)
 
         val position = binding.chart1.getPosition(
-            entry, binding.chart1.data!!.getDataSetByIndex(highlight.dataSetIndex)
-                .axisDependency
+            entry, binding.chart1.data!!.getDataSetByIndex(highlight.dataSetIndex)?.axisDependency
         )
 
         Timber.i(bounds.toString())