diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/BarHighlighter.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/BarHighlighter.kt
index 93f65dc794..df61f84feb 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/BarHighlighter.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/BarHighlighter.kt
@@ -6,7 +6,7 @@ import com.github.mikephil.charting.utils.MPPointD
 import kotlin.math.abs
 import kotlin.math.max
 
-open class BarHighlighter(barDataProvider: BarDataProvider?) : ChartHighlighter<BarDataProvider?>(barDataProvider) {
+open class BarHighlighter(barDataProvider: BarDataProvider?) : ChartHighlighter<BarDataProvider>(barDataProvider) {
     override fun getHighlight(x: Float, y: Float): Highlight? {
         val high = super.getHighlight(x, y) ?: return null
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt
index 0f11682692..5c208d4cd0 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt
@@ -10,11 +10,11 @@ import com.github.mikephil.charting.utils.MPPointD
 import kotlin.math.abs
 import kotlin.math.hypot
 
-open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider?>(protected var provider: T?) : IHighlighter {
+open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider>(protected var provider: T?) : IHighlighter {
     /**
      * buffer for storing previously highlighted values
      */
-    protected var mHighlightBuffer: MutableList<Highlight> = ArrayList()
+    protected var highlightBuffer: MutableList<Highlight> = ArrayList()
 
     override fun getHighlight(x: Float, y: Float): Highlight? {
         val pos = getValsForTouch(x, y)
@@ -87,7 +87,7 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider?>(protect
      * @param y    touch position
      */
     protected open fun getHighlightsAtXValue(xVal: Float, x: Float, y: Float): MutableList<Highlight>? {
-        mHighlightBuffer.clear()
+        highlightBuffer.clear()
 
         val data = this.data
 
@@ -102,11 +102,11 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider?>(protect
                 continue
             }
 
-            mHighlightBuffer.addAll(buildHighlights(dataSet, i, xVal, DataSet.Rounding.CLOSEST))
+            highlightBuffer.addAll(buildHighlights(dataSet, i, xVal, DataSet.Rounding.CLOSEST))
             i++
         }
 
-        return mHighlightBuffer
+        return highlightBuffer
     }
 
     /**
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/CombinedHighlighter.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/CombinedHighlighter.kt
index 61f3f9211c..f05c6d4367 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/CombinedHighlighter.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/CombinedHighlighter.kt
@@ -7,7 +7,7 @@ import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider
 import com.github.mikephil.charting.interfaces.dataprovider.CombinedDataProvider
 import com.github.mikephil.charting.interfaces.datasets.IDataSet
 
-open class CombinedHighlighter(dataProvider: CombinedDataProvider?, barChart: BarDataProvider) : ChartHighlighter<CombinedDataProvider?>(dataProvider), IHighlighter {
+open class CombinedHighlighter(dataProvider: CombinedDataProvider?, barChart: BarDataProvider) : ChartHighlighter<CombinedDataProvider>(dataProvider), IHighlighter {
     /**
      * bar highlighter for supporting stacked highlighting
      */
@@ -20,7 +20,7 @@ open class CombinedHighlighter(dataProvider: CombinedDataProvider?, barChart: Ba
     }
 
     override fun getHighlightsAtXValue(xVal: Float, x: Float, y: Float): MutableList<Highlight>? {
-        mHighlightBuffer.clear()
+        highlightBuffer.clear()
 
         val dataObjects = provider!!.combinedData!!.getAllData()
 
@@ -33,7 +33,7 @@ open class CombinedHighlighter(dataProvider: CombinedDataProvider?, barChart: Ba
 
                 if (high != null) {
                     high.dataIndex = i
-                    mHighlightBuffer.add(high)
+                    highlightBuffer.add(high)
                 }
             } else {
                 var j = 0
@@ -50,13 +50,13 @@ open class CombinedHighlighter(dataProvider: CombinedDataProvider?, barChart: Ba
                     val highs = buildHighlights(dataSet, j, xVal, DataSet.Rounding.CLOSEST)
                     for (high in highs) {
                         high.dataIndex = i
-                        mHighlightBuffer.add(high)
+                        highlightBuffer.add(high)
                     }
                     j++
                 }
             }
         }
 
-        return mHighlightBuffer
+        return highlightBuffer
     }
 }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ChartInterface.java b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ChartInterface.java
index 86fc62c37f..5eba269700 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ChartInterface.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/dataprovider/ChartInterface.java
@@ -39,7 +39,7 @@ public interface ChartInterface {
     float getYChartMax();
 
     /**
-     * Returns the maximum distance in scren dp a touch can be away from an entry to cause it to get highlighted.
+     * Returns the maximum distance in screen dp a touch can be away from an entry to cause it to get highlighted.
      */
     float getMaxHighlightDistance();
 
diff --git a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt
index cfa25e1e47..b2a330d8d9 100644
--- a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt
+++ b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt
@@ -173,9 +173,9 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
                 sets.forEach { set ->
                     set?.let {
                         if (set.isDrawFilledEnabled)
-                            set?.setDrawFilled(false)
+                            set.setDrawFilled(false)
                         else
-                            set?.setDrawFilled(true)
+                            set.setDrawFilled(true)
                     }
                 }
                 binding.chart1.invalidate()