diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/AxisRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/AxisRenderer.kt
index 71c53024f..4bd956fdd 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/AxisRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/AxisRenderer.kt
@@ -70,7 +70,7 @@ abstract class AxisRenderer(
      * paint used for the limit lines
      */
     @JvmField
-    protected var limitLinePaint: Paint? = null
+    protected var limitLinePaint: Paint
 
     init {
         paintAxisLabels = Paint(Paint.ANTI_ALIAS_FLAG)
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt
index f6c05c05d..4b561d51c 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt
@@ -353,12 +353,12 @@ open class XAxisRenderer(
         mLimitLinePath.moveTo(mLimitLineSegmentsBuffer[0], mLimitLineSegmentsBuffer[1])
         mLimitLinePath.lineTo(mLimitLineSegmentsBuffer[2], mLimitLineSegmentsBuffer[3])
 
-        limitLinePaint!!.style = Paint.Style.STROKE
-        limitLinePaint!!.color = limitLine.lineColor
-        limitLinePaint!!.strokeWidth = limitLine.lineWidth
-        limitLinePaint!!.setPathEffect(limitLine.dashPathEffect)
+        limitLinePaint.style = Paint.Style.STROKE
+        limitLinePaint.color = limitLine.lineColor
+        limitLinePaint.strokeWidth = limitLine.lineWidth
+        limitLinePaint.setPathEffect(limitLine.dashPathEffect)
 
-        c.drawPath(mLimitLinePath, limitLinePaint!!)
+        c.drawPath(mLimitLinePath, limitLinePaint)
     }
 
     fun renderLimitLineLabel(c: Canvas, limitLine: LimitLine, position: FloatArray, yOffset: Float) {
@@ -366,11 +366,11 @@ open class XAxisRenderer(
 
         // if drawing the limit-value label is enabled
         if (label != null && label != "") {
-            limitLinePaint!!.style = limitLine.textStyle
-            limitLinePaint!!.setPathEffect(null)
-            limitLinePaint!!.color = limitLine.textColor
-            limitLinePaint!!.strokeWidth = 0.5f
-            limitLinePaint!!.textSize = limitLine.textSize
+            limitLinePaint.style = limitLine.textStyle
+            limitLinePaint.setPathEffect(null)
+            limitLinePaint.color = limitLine.textColor
+            limitLinePaint.strokeWidth = 0.5f
+            limitLinePaint.textSize = limitLine.textSize
 
 
             val xOffset = limitLine.lineWidth + limitLine.xOffset
@@ -379,24 +379,24 @@ open class XAxisRenderer(
 
             if (labelPosition == LimitLabelPosition.RIGHT_TOP) {
                 val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
-                limitLinePaint!!.textAlign = Align.LEFT
+                limitLinePaint.textAlign = Align.LEFT
                 c.drawText(
                     label, position[0] + xOffset, viewPortHandler.contentTop() + yOffset + labelLineHeight,
-                    limitLinePaint!!
+                    limitLinePaint
                 )
             } else if (labelPosition == LimitLabelPosition.RIGHT_BOTTOM) {
-                limitLinePaint!!.textAlign = Align.LEFT
-                c.drawText(label, position[0] + xOffset, viewPortHandler.contentBottom() - yOffset, limitLinePaint!!)
+                limitLinePaint.textAlign = Align.LEFT
+                c.drawText(label, position[0] + xOffset, viewPortHandler.contentBottom() - yOffset, limitLinePaint)
             } else if (labelPosition == LimitLabelPosition.LEFT_TOP) {
-                limitLinePaint!!.textAlign = Align.RIGHT
+                limitLinePaint.textAlign = Align.RIGHT
                 val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
                 c.drawText(
                     label, position[0] - xOffset, viewPortHandler.contentTop() + yOffset + labelLineHeight,
-                    limitLinePaint!!
+                    limitLinePaint
                 )
             } else {
-                limitLinePaint!!.textAlign = Align.RIGHT
-                c.drawText(label, position[0] - xOffset, viewPortHandler.contentBottom() - yOffset, limitLinePaint!!)
+                limitLinePaint.textAlign = Align.RIGHT
+                c.drawText(label, position[0] - xOffset, viewPortHandler.contentBottom() - yOffset, limitLinePaint)
             }
         }
     }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.kt
index 3aead471b..f2c4eaf3f 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.kt
@@ -292,10 +292,10 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
             limitLineClippingRect.inset(0f, -l.lineWidth)
             c.clipRect(limitLineClippingRect)
 
-            limitLinePaint?.style = Paint.Style.STROKE
-            limitLinePaint?.color = l.lineColor
-            limitLinePaint?.strokeWidth = l.lineWidth
-            limitLinePaint?.setPathEffect(l.dashPathEffect)
+            limitLinePaint.style = Paint.Style.STROKE
+            limitLinePaint.color = l.lineColor
+            limitLinePaint.strokeWidth = l.lineWidth
+            limitLinePaint.setPathEffect(l.dashPathEffect)
 
             pts[1] = l.limit
 
@@ -304,7 +304,7 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
             limitLinePath.moveTo(viewPortHandler.contentLeft(), pts[1])
             limitLinePath.lineTo(viewPortHandler.contentRight(), pts[1])
 
-            limitLinePaint?.let { c.drawPath(limitLinePath, it) }
+            c.drawPath(limitLinePath, limitLinePaint)
             limitLinePath.reset()
 
             // c.drawLines(pts, mLimitLinePaint);
@@ -312,12 +312,12 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
 
             // if drawing the limit-value label is enabled
             if (label != null && label != "") {
-                limitLinePaint?.style = l.textStyle
-                limitLinePaint?.setPathEffect(null)
-                limitLinePaint?.color = l.textColor
-                limitLinePaint?.setTypeface(l.typeface)
-                limitLinePaint?.strokeWidth = 0.5f
-                limitLinePaint?.textSize = l.textSize
+                limitLinePaint.style = l.textStyle
+                limitLinePaint.setPathEffect(null)
+                limitLinePaint.color = l.textColor
+                limitLinePaint.setTypeface(l.typeface)
+                limitLinePaint.strokeWidth = 0.5f
+                limitLinePaint.textSize = l.textSize
 
                 val labelLineHeight = Utils.calcTextHeight(limitLinePaint, label).toFloat()
                 val xOffset = Utils.convertDpToPixel(4f) + l.xOffset
@@ -326,8 +326,8 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
                 val position = l.labelPosition
 
                 if (position == LimitLabelPosition.RIGHT_TOP) {
-                    limitLinePaint?.textAlign = Align.RIGHT
-                    limitLinePaint?.let {
+                    limitLinePaint.textAlign = Align.RIGHT
+                    limitLinePaint.let {
                         c.drawText(
                             label,
                             viewPortHandler.contentRight() - xOffset,
@@ -335,7 +335,7 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
                         )
                     }
                 } else if (position == LimitLabelPosition.RIGHT_BOTTOM) {
-                    limitLinePaint?.let {
+                    limitLinePaint.let {
                         it.textAlign = Align.RIGHT
                         c.drawText(
                             label,
@@ -344,7 +344,7 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
                         )
                     }
                 } else if (position == LimitLabelPosition.LEFT_TOP) {
-                    limitLinePaint?.let {
+                    limitLinePaint.let {
                         it.textAlign = Align.LEFT
                         c.drawText(
                             label,
@@ -353,7 +353,7 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
                         )
                     }
                 } else {
-                    limitLinePaint?.let {
+                    limitLinePaint.let {
                         it.textAlign = Align.LEFT
                         c.drawText(
                             label,