diff --git a/chartLib/src/main/kotlin/info/appdev/charting/buffer/AbstractBuffer.kt b/chartLib/src/main/kotlin/info/appdev/charting/buffer/AbstractBuffer.kt
index 78f7f2c96..24d7bb4de 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/buffer/AbstractBuffer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/buffer/AbstractBuffer.kt
@@ -7,19 +7,15 @@ package info.appdev.charting.buffer
 </T> */
 abstract class AbstractBuffer<T>(size: Int) {
     /** index in the buffer  */
-    @JvmField
     protected var index: Int = 0
 
     /** float-buffer that holds the data points to draw, order: x,y,x,y,...  */
-    @JvmField
     val buffer: FloatArray
 
     /** animation phase x-axis  */
-    @JvmField
     protected var phaseX: Float = 1f
 
     /** animation phase y-axis  */
-    @JvmField
     protected var phaseY: Float = 1f
 
     /** indicates from which x-index the visible data begins  */
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/buffer/BarBuffer.kt b/chartLib/src/main/kotlin/info/appdev/charting/buffer/BarBuffer.kt
index 2c7812e70..2dc36a57c 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/buffer/BarBuffer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/buffer/BarBuffer.kt
@@ -7,33 +7,22 @@ open class BarBuffer(size: Int, dataSetCount: Int, containsStacks: Boolean) : Ab
     protected var dataSetIndex: Int = 0
     protected var dataSetCount: Int = 1
 
-    @JvmField
     protected var containsStacks: Boolean = false
 
-    @JvmField
-    protected var inverted: Boolean = false
+    var inverted: Boolean = false
 
     /** width of the bar on the x-axis, in values (not pixels)  */
-    @JvmField
-    protected var barWidth: Float = 1f
+    var barWidth: Float = 1f
 
     init {
         this.dataSetCount = dataSetCount
         this.containsStacks = containsStacks
     }
 
-    fun setBarWidth(barWidthGiven: Float) {
-        this.barWidth = barWidthGiven
-    }
-
     fun setDataSet(index: Int) {
         this.dataSetIndex = index
     }
 
-    fun setInverted(invertedGiven: Boolean) {
-        this.inverted = invertedGiven
-    }
-
     protected fun addBar(left: Float, top: Float, right: Float, bottom: Float) {
         buffer[index++] = left
         buffer[index++] = top
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt b/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt
index 6ba85b55d..945d18ea8 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt
@@ -66,7 +66,6 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>?> : ViewGroup, IBase
      * object that holds all data that was originally set for the chart, before
      * it was modified or any filtering algorithms had been applied
      */
-    @JvmField
     protected var mData: T? = null
 
     /**
@@ -120,13 +119,11 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>?> : ViewGroup, IBase
     /**
      * the object representing the labels on the x-axis
      */
-    @JvmField
     protected var mXAxis: XAxis = XAxis()
 
     /**
      * if true, touch gestures are enabled on the chart
      */
-    @JvmField
     protected var mTouchEnabled: Boolean = true
 
     /**
@@ -186,7 +183,6 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>?> : ViewGroup, IBase
     /**
      * object responsible for rendering the data
      */
-    @JvmField
     protected var mRenderer: DataRenderer? = null
 
     var highlighter: IHighlighter? = null
@@ -195,9 +191,7 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>?> : ViewGroup, IBase
     /**
      * Returns the ViewPortHandler of the chart that is responsible for the
      * content area of the chart and its offsets and dimensions.
-     */
-    /**
-     * object that manages the bounds and drawing constraints of the chart
+     * Object that manages the bounds and drawing constraints of the chart
      */
     var viewPortHandler: ViewPortHandler = ViewPortHandler()
         protected set
@@ -281,39 +275,6 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>?> : ViewGroup, IBase
         this.legendRenderer = LegendRenderer(this.viewPortHandler, this.legend!!)
     }
 
-    // public void initWithDummyData() {
-    // ColorTemplate template = new ColorTemplate();
-    // template.addColorsForDataSets(ColorTemplate.COLORFUL_COLORS,
-    // getContext());
-    //
-    // setColorTemplate(template);
-    // setDrawYValues(false);
-    //
-    // ArrayList<String> xVals = new ArrayList<String>();
-    // Calendar calendar = Calendar.getInstance();
-    // for (int i = 0; i < 12; i++) {
-    // xVals.add(calendar.getDisplayName(Calendar.MONTH, Calendar.SHORT,
-    // Locale.getDefault()));
-    // }
-    //
-    // ArrayList<DataSet> dataSets = new ArrayList<DataSet>();
-    // for (int i = 0; i < 3; i++) {
-    //
-    // ArrayList<Entry> yVals = new ArrayList<Entry>();
-    //
-    // for (int j = 0; j < 12; j++) {
-    // float val = (float) (Math.random() * 100);
-    // yVals.add(new Entry(val, j));
-    // }
-    //
-    // DataSet set = new DataSet(yVals, "DataSet " + i);
-    // dataSets.add(set); // add the datasets
-    // }
-    // // create a data object with the datasets
-    // ChartData data = new ChartData(xVals, dataSets);
-    // setData(data);
-    // invalidate();
-    // }
     /**
      * Sets a new data object for the chart. The data object contains all values
      * and information needed for displaying.
@@ -574,7 +535,6 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>?> : ViewGroup, IBase
      * @param dataIndex    The data index to search in (only used in CombinedChartView currently)
      * @param callListener Should the listener be called for this change
      */
-    @JvmOverloads
     fun highlightValue(x: Float, dataSetIndex: Int, dataIndex: Int = -1, callListener: Boolean = true) {
         highlightValue(x, Float.NaN, dataSetIndex, dataIndex, callListener)
     }
@@ -601,7 +561,6 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>?> : ViewGroup, IBase
      * @param dataSetIndex The dataset index to search in
      * @param dataIndex    The data index to search in (only used in CombinedChartView currently)
      */
-    @JvmOverloads
     fun highlightValue(x: Float, y: Float, dataSetIndex: Int, dataIndex: Int = -1, callListener: Boolean = true) {
         if (dataSetIndex < 0 || dataSetIndex >= mData!!.dataSetCount) {
             highlightValue(null, callListener)
@@ -1221,7 +1180,6 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>?> : ViewGroup, IBase
      * @param quality         e.g. 50, min = 0, max = 100
      * @return returns true if saving was successful, false if not
      */
-    @JvmOverloads
     fun saveToGallery(
         fileName: String,
         subFolderPath: String? = "",
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/components/AxisBase.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/AxisBase.kt
index 79f889dc2..5de7dee1c 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/components/AxisBase.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/components/AxisBase.kt
@@ -53,7 +53,6 @@ abstract class AxisBase : ComponentBase() {
     /**
      * the number of entries the legend contains
      */
-    @JvmField
     var entryCount: Int = 0
 
     /**
@@ -215,19 +214,16 @@ abstract class AxisBase : ComponentBase() {
     /**
      * don't touch this direclty, use setter
      */
-    @JvmField
     var mAxisMaximum: Float = 0f
 
     /**
      * don't touch this directly, use setter
      */
-    @JvmField
     var mAxisMinimum: Float = 0f
 
     /**
      * the total range of values this axis covers
      */
-    @JvmField
     var mAxisRange: Float = 0f
 
     private var mAxisMinLabels = 2
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/components/ComponentBase.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/ComponentBase.kt
index dd7a3f4ef..5f80c3079 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/components/ComponentBase.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/components/ComponentBase.kt
@@ -17,13 +17,11 @@ abstract class ComponentBase {
     /**
      * the offset in pixels this component has on the x-axis
      */
-    @JvmField
     protected var mXOffset: Float = 5f
 
     /**
      * the offset in pixels this component has on the Y-axis
      */
-    @JvmField
     protected var mYOffset: Float = 5f
 
     /**
@@ -34,7 +32,6 @@ abstract class ComponentBase {
     /**
      * the text size of the labels
      */
-    @JvmField
     protected var mTextSize: Float = 10f.convertDpToPixel()
 
     /**
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/components/Description.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/Description.kt
index 0eca946c0..91a16cf87 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/components/Description.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/components/Description.kt
@@ -8,10 +8,7 @@ class Description : ComponentBase() {
     /**
      * Sets the text to be shown as the description.
      * Never set this to null as this will cause nullpointer exception when drawing with Android Canvas.
-     *
-     * @param text
      */
-    @JvmField
     var text: String? = "Description Label"
 
     /**
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt
index 1e61679cb..34f380b59 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt
@@ -323,10 +323,6 @@ class Legend() : ComponentBase() {
 
     var mTextWidthMax: Float = 0f
 
-    /**
-     * If this is set, then word wrapping the legend is enabled. This means the
-     * legend will not be cut off if too long.
-     */
     /**
      * Should the legend word wrap? / this is currently supported only for:
      * BelowChartLeft, BelowChartRight, BelowChartCenter. / note that word
@@ -334,18 +330,12 @@ class Legend() : ComponentBase() {
      * maxSizePercent when word wrapping, to set the point where the text wraps.
      * / default: false
      */
-    /**
-     * flag that indicates if word wrapping is enabled
-     */
     var isWordWrapEnabled: Boolean = false
 
     val calculatedLabelSizes: MutableList<FSize?> = ArrayList<FSize?>(16)
     val calculatedLabelBreakPoints: MutableList<Boolean?> = ArrayList<Boolean?>(16)
     val calculatedLineSizes: MutableList<FSize?> = ArrayList<FSize?>(16)
 
-    /**
-     * default constructor
-     */
     init {
         this.mTextSize = 10f.convertDpToPixel()
         this.mXOffset = 5f.convertDpToPixel()
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/data/ChartData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/ChartData.kt
index 56f171451..a88d284f9 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/data/ChartData.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/data/ChartData.kt
@@ -7,7 +7,6 @@ import info.appdev.charting.highlight.Highlight
 import info.appdev.charting.interfaces.datasets.IDataSet
 import timber.log.Timber
 import java.io.Serializable
-import java.util.Collections
 
 /**
  * Class that holds all relevant data that represents the chart. That involves at least one (or more) DataSets, and an array of x-values.
@@ -38,59 +37,29 @@ abstract class ChartData<T : IDataSet<out Entry>> : Serializable {
     var xMin: Float = Float.MAX_VALUE
         protected set
 
-
-    @JvmField
     protected var mLeftAxisMax: Float = -Float.MAX_VALUE
 
-    @JvmField
     protected var mLeftAxisMin: Float = Float.MAX_VALUE
 
-    @JvmField
     protected var mRightAxisMax: Float = -Float.MAX_VALUE
 
-    @JvmField
     protected var mRightAxisMin: Float = Float.MAX_VALUE
 
-    /**
-     * Returns all DataSet objects this ChartData object holds.
-     */
     /**
      * array that holds all DataSets the ChartData object represents
      */
     open var dataSets: MutableList<T>? = null
         protected set
 
-    /**
-     * Default constructor.
-     */
     constructor() {
         this.dataSets = ArrayList<T>()
     }
 
-    /**
-     * Constructor taking single or multiple DataSet objects.
-     */
     constructor(vararg dataSets: T) {
         this.dataSets = dataSets.toMutableList()
         notifyDataChanged()
     }
 
-    /**
-     * Created because Arrays.asList(...) does not support modification.
-     */
-    private fun arrayToList(array: Array<T>): MutableList<T> {
-        val list: MutableList<T> = ArrayList()
-
-        Collections.addAll(list, *array)
-
-        return list
-    }
-
-    /**
-     * constructor for chart data
-     *
-     * @param sets the dataset array
-     */
     constructor(sets: MutableList<T>) {
         this.dataSets = sets
         notifyDataChanged()
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/data/DataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/DataSet.kt
index 87563982f..1f3773808 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/data/DataSet.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/data/DataSet.kt
@@ -15,7 +15,7 @@ import kotlin.math.abs
  * LineChart, or the values of a specific group of bars in the BarChart).
  */
 abstract class DataSet<T : Entry>(
-    @JvmField protected var mEntries: MutableList<T>?,
+    protected var mEntries: MutableList<T>?,
     label: String = ""
 ) : BaseDataSet<T>(label), Serializable {
     /**
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/data/PieEntry.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/PieEntry.kt
index b460dddc1..172e62dcf 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/data/PieEntry.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/data/PieEntry.kt
@@ -6,7 +6,6 @@ import timber.log.Timber
 
 @SuppressLint("ParcelCreator")
 class PieEntry : Entry {
-    @JvmField
     var label: String? = null
 
     constructor(value: Float) : super(0f, value)
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/listener/BarLineChartTouchListener.kt b/chartLib/src/main/kotlin/info/appdev/charting/listener/BarLineChartTouchListener.kt
index c8879437c..ef85ac2a6 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/listener/BarLineChartTouchListener.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/listener/BarLineChartTouchListener.kt
@@ -533,7 +533,7 @@ class BarLineChartTouchListener(
         }
 
         val h = chart.getHighlightByTouchPoint(e.x, e.y)
-        performHighlight(h, e)
+        performHighlight(h)
 
         return super.onSingleTapUp(e)
     }
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/listener/ChartTouchListener.kt b/chartLib/src/main/kotlin/info/appdev/charting/listener/ChartTouchListener.kt
index f639f6a24..e93915164 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/listener/ChartTouchListener.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/listener/ChartTouchListener.kt
@@ -8,8 +8,7 @@ import info.appdev.charting.charts.Chart
 import info.appdev.charting.highlight.Highlight
 import kotlin.math.sqrt
 
-abstract class ChartTouchListener<T : Chart<*>>(
-    @JvmField protected var chart: T) : SimpleOnGestureListener(), OnTouchListener {
+abstract class ChartTouchListener<T : Chart<*>>(protected var chart: T) : SimpleOnGestureListener(), OnTouchListener {
     enum class ChartGesture {
         NONE, DRAG, X_ZOOM, Y_ZOOM, PINCH_ZOOM, ROTATE, SINGLE_TAP, DOUBLE_TAP, LONG_PRESS, FLING
     }
@@ -32,37 +31,26 @@ abstract class ChartTouchListener<T : Chart<*>>(
     protected var mLastHighlighted: Highlight? = null
 
     /**
-     * the gesturedetector used for detecting taps and longpresses, ...
+     * the gesture detector used for detecting taps and long presses, ...
      */
-    @JvmField
     protected var gestureDetector: GestureDetector? = GestureDetector(chart.context, this)
 
     /**
      * Calls the OnChartGestureListener to do the start callback
-     *
-     * @param me
      */
     fun startAction(me: MotionEvent) {
-        val l = chart.onChartGestureListener
-
-        if (l != null) l.onChartGestureStart(me, this.lastGesture)
+        chart.onChartGestureListener?.onChartGestureStart(me, this.lastGesture)
     }
 
     /**
      * Calls the OnChartGestureListener to do the end callback
-     *
-     * @param me
      */
     fun endAction(me: MotionEvent) {
-        val l = chart.onChartGestureListener
-
-        if (l != null) l.onChartGestureEnd(me, this.lastGesture)
+        chart.onChartGestureListener?.onChartGestureEnd(me, this.lastGesture)
     }
 
     /**
      * Sets the last value that was highlighted via touch.
-     *
-     * @param high
      */
     fun setLastHighlighted(high: Highlight?) {
         mLastHighlighted = high
@@ -70,10 +58,8 @@ abstract class ChartTouchListener<T : Chart<*>>(
 
     /**
      * Perform a highlight operation.
-     *
-     * @param motionEvent
      */
-    protected fun performHighlight(highlight: Highlight?, motionEvent: MotionEvent?) {
+    protected fun performHighlight(highlight: Highlight?) {
         if (highlight == null || highlight.equalTo(mLastHighlighted)) {
             chart.highlightValue(null, true)
             mLastHighlighted = null
@@ -84,7 +70,6 @@ abstract class ChartTouchListener<T : Chart<*>>(
     }
 
     companion object {
-        // states
         protected const val NONE: Int = 0
         protected const val DRAG: Int = 1
         protected const val X_ZOOM: Int = 2
@@ -96,7 +81,6 @@ abstract class ChartTouchListener<T : Chart<*>>(
         /**
          * returns the distance between two points
          */
-        @JvmStatic
         protected fun distance(eventX: Float, startX: Float, eventY: Float, startY: Float): Float {
             val dx = eventX - startX
             val dy = eventY - startY
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/listener/PieRadarChartTouchListener.kt b/chartLib/src/main/kotlin/info/appdev/charting/listener/PieRadarChartTouchListener.kt
index 498398a04..d0906dd10 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/listener/PieRadarChartTouchListener.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/listener/PieRadarChartTouchListener.kt
@@ -119,7 +119,7 @@ class PieRadarChartTouchListener(chart: PieRadarChartBase<*>) : ChartTouchListen
         }
 
         val high = chart.getHighlightByTouchPoint(e.x, e.y)
-        performHighlight(high, e)
+        performHighlight(high)
 
         return true
     }
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/AxisRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/AxisRenderer.kt
index ad97d2020..434f15a77 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/AxisRenderer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/AxisRenderer.kt
@@ -23,7 +23,6 @@ abstract class AxisRenderer(
     /** transformer to transform values to screen pixels and return  */
     var transformer: Transformer?,
     /** base axis this axis renderer works with  */
-    @JvmField
     protected var axis: AxisBase
 ) : Renderer(viewPortHandler) {
 
@@ -57,7 +56,6 @@ abstract class AxisRenderer(
     /**
      * paint used for the limit lines
      */
-    @JvmField
     protected var limitLinePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
         style = Paint.Style.STROKE
     }
@@ -65,7 +63,6 @@ abstract class AxisRenderer(
     /**
      * paint used for the limit ranges
      */
-    @JvmField
     protected var limitRangePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
         style = Paint.Style.STROKE
     }
@@ -73,7 +70,6 @@ abstract class AxisRenderer(
     /**
      * paint used for the limit range fill
      */
-    @JvmField
     protected var limitRangePaintFill = Paint(Paint.ANTI_ALIAS_FLAG).apply {
         style = Paint.Style.FILL
     }
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/BarChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/BarChartRenderer.kt
index df9e65ea9..34aca9426 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/BarChartRenderer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/BarChartRenderer.kt
@@ -20,23 +20,19 @@ import kotlin.math.ceil
 import kotlin.math.min
 
 open class BarChartRenderer(
-    @JvmField var dataProvider: BarDataProvider,
+    var dataProvider: BarDataProvider,
     animator: ChartAnimator,
     viewPortHandler: ViewPortHandler
 ) : BarLineScatterCandleBubbleRenderer(animator, viewPortHandler) {
     /**
      * the rect object that is used for drawing the bars
      */
-    @JvmField
     protected var barRect: RectF = RectF()
 
-    @JvmField
     protected var barBuffers: MutableList<BarBuffer?> = mutableListOf()
 
-    @JvmField
     protected var shadowPaint: Paint
 
-    @JvmField
     protected var barBorderPaint: Paint
 
     /**
@@ -162,14 +158,14 @@ open class BarChartRenderer(
         }
 
         // initialize the buffer
-        val buffer = barBuffers[index]!!.apply {
+        val buffer = barBuffers[index]?.apply {
             setPhases(phaseX, phaseY)
             setDataSet(index)
-            setInverted(dataProvider.isInverted(dataSet.axisDependency))
-            dataProvider.barData?.let { setBarWidth(it.barWidth) }
+            inverted = dataProvider.isInverted(dataSet.axisDependency)
+            dataProvider.barData?.let { barWidth = it.barWidth }
             feed(dataSet)
         }
-        trans!!.pointValuesToPixel(buffer.buffer)
+        trans!!.pointValuesToPixel(buffer!!.buffer)
 
         val isCustomFill = dataSet.fills.isNotEmpty()
         val isSingleColor = dataSet.colors.size == 1
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/BubbleChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/BubbleChartRenderer.kt
index dcabae948..998781e63 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/BubbleChartRenderer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/BubbleChartRenderer.kt
@@ -20,12 +20,11 @@ import kotlin.math.sqrt
 
 @Suppress("MemberVisibilityCanBePrivate")
 open class BubbleChartRenderer(
-    @JvmField
     var dataProvider: BubbleDataProvider, animator: ChartAnimator,
     viewPortHandler: ViewPortHandler
 ) : BarLineScatterCandleBubbleRenderer(animator, viewPortHandler) {
-    override fun initBuffers() {
-    }
+
+    override fun initBuffers() = Unit
 
     override fun drawData(canvas: Canvas) {
         val bubbleData = dataProvider.bubbleData
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/CandleStickChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/CandleStickChartRenderer.kt
index 995fc7d3c..260711d73 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/CandleStickChartRenderer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/CandleStickChartRenderer.kt
@@ -13,7 +13,6 @@ import info.appdev.charting.utils.ViewPortHandler
 import info.appdev.charting.utils.convertDpToPixel
 
 open class CandleStickChartRenderer(
-    @JvmField
     var dataProvider: CandleDataProvider, animator: ChartAnimator,
     viewPortHandler: ViewPortHandler
 ) : LineScatterCandleRadarRenderer(animator, viewPortHandler) {
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/DataRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/DataRenderer.kt
index 874eab225..107c960a6 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/DataRenderer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/DataRenderer.kt
@@ -18,7 +18,7 @@ import info.appdev.charting.utils.convertDpToPixel
  */
 @Suppress("MemberVisibilityCanBePrivate")
 abstract class DataRenderer(
-    @JvmField protected var animator: ChartAnimator, viewPortHandler: ViewPortHandler
+    protected var animator: ChartAnimator, viewPortHandler: ViewPortHandler
 ) : Renderer(viewPortHandler) {
 
     /**
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/HorizontalBarChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/HorizontalBarChartRenderer.kt
index 9d78815e0..61d05628c 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/HorizontalBarChartRenderer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/HorizontalBarChartRenderer.kt
@@ -103,8 +103,8 @@ open class HorizontalBarChartRenderer(
         val buffer = barBuffers[index]!!
         buffer.setPhases(phaseX, phaseY)
         buffer.setDataSet(index)
-        buffer.setInverted(dataProvider.isInverted(dataSet.axisDependency))
-        dataProvider.barData?.let { buffer.setBarWidth(it.barWidth) }
+        buffer.inverted = dataProvider.isInverted(dataSet.axisDependency)
+        dataProvider.barData?.let { buffer.barWidth = it.barWidth }
 
         buffer.feed(dataSet)
 
@@ -139,14 +139,14 @@ open class HorizontalBarChartRenderer(
 
             if (isCustomFill) {
                 dataSet.getFill(pos)?.fillRect(
-                        canvas, paintRender,
-                        buffer.buffer[j],
-                        buffer.buffer[j + 1],
-                        buffer.buffer[j + 2],
-                        buffer.buffer[j + 3],
-                        if (isInverted) Fill.Direction.LEFT else Fill.Direction.RIGHT,
-                        0f
-                    )
+                    canvas, paintRender,
+                    buffer.buffer[j],
+                    buffer.buffer[j + 1],
+                    buffer.buffer[j + 2],
+                    buffer.buffer[j + 3],
+                    if (isInverted) Fill.Direction.LEFT else Fill.Direction.RIGHT,
+                    0f
+                )
             } else {
                 canvas.drawRect(
                     buffer.buffer[j], buffer.buffer[j + 1], buffer.buffer[j + 2],
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineChartRenderer.kt
index f50e592d7..77f2ab3bc 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineChartRenderer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineChartRenderer.kt
@@ -24,7 +24,7 @@ import kotlin.math.max
 import kotlin.math.min
 
 open class LineChartRenderer(
-    @JvmField var dataProvider: LineDataProvider, animator: ChartAnimator,
+    var dataProvider: LineDataProvider, animator: ChartAnimator,
     viewPortHandler: ViewPortHandler
 ) : LineRadarRenderer(animator, viewPortHandler) {
     /**
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/Renderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/Renderer.kt
index 8108c0a30..0cb0fe3fd 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/Renderer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/Renderer.kt
@@ -6,6 +6,5 @@ abstract class Renderer(
     /**
      * the component that handles the drawing area of the chart and it's offsets
      */
-    @JvmField
     protected var viewPortHandler: ViewPortHandler
 )
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedBarChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedBarChartRenderer.kt
index 6c8a9e7b0..aecf4e860 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedBarChartRenderer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedBarChartRenderer.kt
@@ -82,8 +82,8 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, v
             val buffer = barBuffers[index]!!
             buffer.setPhases(phaseX, phaseY)
             buffer.setDataSet(index)
-            buffer.setInverted(dataProvider.isInverted(dataSet.axisDependency))
-            dataProvider.barData?.let { buffer.setBarWidth(it.barWidth) }
+            buffer.inverted = dataProvider.isInverted(dataSet.axisDependency)
+            dataProvider.barData?.let { buffer.barWidth = it.barWidth }
             buffer.feed(dataSet)
             trans!!.pointValuesToPixel(buffer.buffer)
 
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedHorizontalBarChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedHorizontalBarChartRenderer.kt
index f13a5331f..a32e1d1d1 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedHorizontalBarChartRenderer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RoundedHorizontalBarChartRenderer.kt
@@ -71,8 +71,8 @@ class RoundedHorizontalBarChartRenderer(chart: BarDataProvider, animator: ChartA
             val buffer = barBuffers[index]!!
             buffer.setPhases(phaseX, phaseY)
             buffer.setDataSet(index)
-            buffer.setInverted(dataProvider.isInverted(dataSet.axisDependency))
-            dataProvider.barData?.let { buffer.setBarWidth(it.barWidth) }
+            buffer.inverted = dataProvider.isInverted(dataSet.axisDependency)
+            dataProvider.barData?.let { buffer.barWidth = it.barWidth }
             buffer.feed(dataSet)
             trans!!.pointValuesToPixel(buffer.buffer)
 
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/ScatterChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/ScatterChartRenderer.kt
index 7abd0ac74..dae52fddc 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/ScatterChartRenderer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/ScatterChartRenderer.kt
@@ -13,7 +13,7 @@ import timber.log.Timber
 import kotlin.math.ceil
 import kotlin.math.min
 
-open class ScatterChartRenderer(@JvmField var dataProvider: ScatterDataProvider, animator: ChartAnimator, viewPortHandler: ViewPortHandler) :
+open class ScatterChartRenderer(var dataProvider: ScatterDataProvider, animator: ChartAnimator, viewPortHandler: ViewPortHandler) :
     LineScatterCandleRadarRenderer(animator, viewPortHandler) {
     override fun initBuffers() = Unit
 
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRenderer.kt
index 959f4fad8..fbd0df20b 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRenderer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/XAxisRenderer.kt
@@ -281,7 +281,6 @@ open class XAxisRenderer(
         }
     }
 
-    @JvmField
     protected var mGridClippingRect: RectF = RectF()
 
     open val gridClippingRect: RectF?
@@ -291,10 +290,8 @@ open class XAxisRenderer(
             return mGridClippingRect
         }
 
-    @JvmField
     protected var mRenderLimitLinesBuffer: FloatArray = FloatArray(2)
 
-    @JvmField
     protected var mLimitLineClippingRect: RectF = RectF()
 
     var limitLineSegmentsBuffer: FloatArray = FloatArray(4)
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRenderer.kt
index 085b72a35..0901b98bf 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRenderer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/YAxisRenderer.kt
@@ -17,10 +17,9 @@ import androidx.core.graphics.withClip
 import info.appdev.charting.utils.calcTextHeight
 import info.appdev.charting.utils.convertDpToPixel
 
-open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected var yAxis: YAxis, trans: Transformer?) :
+open class YAxisRenderer(viewPortHandler: ViewPortHandler, protected var yAxis: YAxis, trans: Transformer?) :
     AxisRenderer(viewPortHandler, trans, yAxis) {
 
-    @JvmField
     protected var zeroLinePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
         color = Color.GRAY
         strokeWidth = 1f
@@ -166,7 +165,6 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
         }
     }
 
-    @JvmField
     protected var mGridClippingRect: RectF = RectF()
 
     open val gridClippingRect: RectF?
@@ -186,7 +184,6 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
         return p
     }
 
-    @JvmField
     protected var mGetTransformedPositionsBuffer: FloatArray = FloatArray(2)
     protected open val transformedPositions: FloatArray
         /**
@@ -222,7 +219,6 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
 
     protected var drawZeroLinePath: Path = Path()
 
-    @JvmField
     protected var zeroLineClippingRect: RectF = RectF()
 
     /**
@@ -257,7 +253,6 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
     protected var renderLimitLines: Path = Path()
     protected open var renderLimitLinesBuffer: FloatArray = FloatArray(2)
 
-    @JvmField
     protected var limitLineClippingRect: RectF = RectF()
 
     init {
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/utils/PointF.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/PointF.kt
index b63c0443d..c36f60674 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/utils/PointF.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/PointF.kt
@@ -59,7 +59,6 @@ class PointF : Poolable<PointF> {
             return result
         }
 
-        @JvmStatic
         fun recycleInstance(instance: PointF?) {
             pool.recycle(instance)
         }
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/utils/Transformer.kt b/chartLib/src/main/kotlin/info/appdev/charting/utils/Transformer.kt
index 2440a7a1e..7498f26fc 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/utils/Transformer.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/utils/Transformer.kt
@@ -17,7 +17,7 @@ import kotlin.Int
  * Transformer class that contains all matrices and is responsible for
  * transforming values into pixels on the screen and backwards.
  */
-open class Transformer(@JvmField protected var viewPortHandler: ViewPortHandler) {
+open class Transformer(protected var viewPortHandler: ViewPortHandler) {
     /**
      * matrix to map the values to the screen pixels
      */