diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarEntry.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarEntry.kt
index 145c2b39ee..d1baeb1456 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarEntry.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarEntry.kt
@@ -9,7 +9,7 @@ import kotlin.math.abs
  * Entry class for the BarChart. (especially stacked bars)
  */
 @SuppressLint("ParcelCreator")
-class BarEntry : Entry {
+open class BarEntry : Entry {
     /**
      * Returns the stacked values this BarEntry represents, or null, if only a single value is represented (then, use
      * getY()).
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseEntry.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseEntry.kt
index c885245a18..b737ad8e76 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseEntry.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseEntry.kt
@@ -4,11 +4,11 @@ import android.graphics.drawable.Drawable
 
 abstract class BaseEntry {
 
-    protected var _y: Float = 0f
+    protected var yBase: Float = 0f
     open var y: Float
-        get() = _y
+        get() = yBase
         set(value) {
-            _y = value
+            yBase = value
         }
 
     var data: Any? = null
@@ -18,7 +18,7 @@ abstract class BaseEntry {
     constructor()
 
     constructor(y: Float) {
-        this._y = y
+        this.yBase = y
     }
 
     constructor(y: Float, data: Any?) : this(y) {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.java
index 4d7af48287..4f0d51baa4 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.java
@@ -169,7 +169,7 @@ protected void copy(DataSet dataSet) {
         super.copy(dataSet);
     }
 
-    @Override
+	@Override
     public String toString() {
         StringBuilder buffer = new StringBuilder();
         buffer.append(toSimpleString());
@@ -184,11 +184,12 @@ public String toString() {
      * the number of Entries.
      */
     public String toSimpleString() {
-        StringBuilder buffer = new StringBuilder();
-        buffer.append("DataSet, label: " + (getLabel() == null ? "" : getLabel()) + ", entries: " + mEntries.size() +
-                "\n");
-        return buffer.toString();
-    }
+        return "DataSet, label: " +
+				(getLabel() == null ? "" : getLabel()) +
+				", entries: " +
+				mEntries.size() +
+				"\n";
+	}
 
     @Override
     public float getYMin() {
@@ -210,11 +211,8 @@ public float getXMax() {
         return mXMax;
     }
 
-    @Override
-    public void addEntryOrdered(T entry) {
-
-        if (entry == null)
-            return;
+	@Override
+	public void addEntryOrdered(T entry) {
 
         if (mEntries == null) {
             mEntries = new ArrayList<>();
@@ -236,16 +234,12 @@ public void clear() {
         notifyDataSetChanged();
     }
 
-    @Override
-    public boolean addEntry(T entry) {
-
-        if (entry == null)
-            return false;
-
-        List<T> values = getEntries();
-        if (values == null) {
-            values = new ArrayList<>();
-        }
+	@Override
+	public boolean addEntry(T entry) {
+		List<T> values = getEntries();
+		if (values == null) {
+			values = new ArrayList<>();
+		}
 
         calcMinMax(entry);
 
@@ -253,11 +247,8 @@ public boolean addEntry(T entry) {
         return values.add(entry);
     }
 
-    @Override
-    public boolean removeEntry(T entry) {
-
-        if (entry == null)
-            return false;
+	@Override
+	public boolean removeEntry(T entry) {
 
         if (mEntries == null)
             return false;
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/Entry.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/Entry.kt
index b02f4c10f5..84bf4c4f86 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/Entry.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/Entry.kt
@@ -125,7 +125,7 @@ open class Entry : BaseEntry, Parcelable, Serializable {
 
     protected constructor(`in`: Parcel) {
         this._x = `in`.readFloat()
-        this._y = `in`.readFloat()
+        this.yBase = `in`.readFloat()
         if (`in`.readInt() == 1) {
             this.data = `in`.readParcelable(Any::class.java.classLoader)
         }