diff --git a/src/animations/splineanimation.cpp b/src/animations/splineanimation.cpp
index 3472cd9..7e33f3c 100644
--- a/src/animations/splineanimation.cpp
+++ b/src/animations/splineanimation.cpp
@@ -39,14 +39,14 @@ SplineAnimation::~SplineAnimation()
 
 void SplineAnimation::setup(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newControlPoints, int index)
 {
-    if(newPoints.count() * 2 - 2 != newControlPoints.count() || newControlPoints.count() < 2){
-           m_valid=false;
-           m_dirty=false;
-           m_item->setGeometryPoints(newPoints);
-           m_item->setControlGeometryPoints(newControlPoints);
-           m_item->setDirty(false);
-           m_item->updateGeometry();
-           return;
+    if (newPoints.count() * 2 - 2 != newControlPoints.count() || newControlPoints.count() < 2) {
+        m_valid=false;
+        m_dirty=false;
+        m_item->setGeometryPoints(newPoints);
+        m_item->setControlGeometryPoints(newControlPoints);
+        m_item->setDirty(false);
+        m_item->updateGeometry();
+        return;
     }
 
     m_type = NewAnimation;
diff --git a/src/splinechart/qsplineseries.cpp b/src/splinechart/qsplineseries.cpp
index 5b03f4c..b6e507c 100644
--- a/src/splinechart/qsplineseries.cpp
+++ b/src/splinechart/qsplineseries.cpp
@@ -200,8 +200,6 @@ QVector<qreal> QSplineSeriesPrivate::firstControlPoints(const QVector<qreal>& ve
 
 QPointF QSplineSeriesPrivate::controlPoint(int index) const
 {
-    //    Q_D(const QSplineSeries);
-    //    return d->m_controlPoints[index];
     return m_controlPoints[index];
 }
 
diff --git a/src/splinechart/splinechartitem.cpp b/src/splinechart/splinechartitem.cpp
index c748af1..9b26a62 100644
--- a/src/splinechart/splinechartitem.cpp
+++ b/src/splinechart/splinechartitem.cpp
@@ -84,12 +84,11 @@ void SplineChartItem::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> 
         controlPoints[2 * i + 1] = calculateGeometryControlPoint(2 * i + 1);
     }
 
-    if (m_animation) {
-        m_animation->setup(oldPoints,newPoints,m_controlPoints,controlPoints,index);
-    }
+    if (m_animation)
+        m_animation->setup(oldPoints, newPoints, m_controlPoints, controlPoints, index);
 
-    setGeometryPoints(newPoints);
-    setControlGeometryPoints(controlPoints);
+    m_points = newPoints;
+    m_controlPoints = controlPoints;
     setDirty(false);
 
     if (m_animation) {
@@ -106,8 +105,8 @@ QPointF SplineChartItem::calculateGeometryControlPoint(int index) const
 
 void SplineChartItem::updateGeometry()
 {
-    const QVector<QPointF> &points = geometryPoints();
-    const QVector<QPointF> &controlPoints = controlGeometryPoints();
+    const QVector<QPointF> &points = m_points;
+    const QVector<QPointF> &controlPoints = m_controlPoints;
 
     if ((points.size()<2) || (controlPoints.size()<2)) {
     	prepareGeometryChange();
diff --git a/src/xychart/qxyseries.cpp b/src/xychart/qxyseries.cpp
index df78871..eb86d41 100644
--- a/src/xychart/qxyseries.cpp
+++ b/src/xychart/qxyseries.cpp
@@ -224,7 +224,6 @@ void QXYSeries::replace(const QPointF &oldPoint,const QPointF &newPoint)
     int index = d->m_points.indexOf(oldPoint);
     if(index==-1) return;
     d->m_points[index] = newPoint;
-//    emit d->pointReplaced(index);
     emit pointReplaced(index);
 }
 
diff --git a/src/xychart/xychart.cpp b/src/xychart/xychart.cpp
index ff4d8fb..557bd29 100644
--- a/src/xychart/xychart.cpp
+++ b/src/xychart/xychart.cpp
@@ -41,13 +41,10 @@ m_series(series),
 m_animation(0),
 m_dirty(true)
 {
-//    QObject::connect(series->d_func(),SIGNAL(pointReplaced(int)),this,SLOT(handlePointReplaced(int)));
-//    QObject::connect(series->d_func(),SIGNAL(pointAdded(int)),this,SLOT(handlePointAdded(int)));
-//    QObject::connect(series->d_func(),SIGNAL(pointRemoved(int)),this,SLOT(handlePointRemoved(int)));
-    QObject::connect(series, SIGNAL(pointReplaced(int)), this,SLOT(handlePointReplaced(int)));
-    QObject::connect(series, SIGNAL(pointAdded(int)), this,SLOT(handlePointAdded(int)));
-    QObject::connect(series, SIGNAL(pointRemoved(int)), this,SLOT(handlePointRemoved(int)));
-    QObject::connect(this, SIGNAL(clicked(QPointF)), series,SIGNAL(clicked(QPointF)));
+    QObject::connect(series, SIGNAL(pointReplaced(int)), this, SLOT(handlePointReplaced(int)));
+    QObject::connect(series, SIGNAL(pointAdded(int)), this, SLOT(handlePointAdded(int)));
+    QObject::connect(series, SIGNAL(pointRemoved(int)), this, SLOT(handlePointRemoved(int)));
+    QObject::connect(this, SIGNAL(clicked(QPointF)), series, SIGNAL(clicked(QPointF)));
 }
 
 void XYChart::setGeometryPoints(const QVector<QPointF>& points)
@@ -120,12 +117,12 @@ void XYChart::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoin
 
     if (m_animation) {
         m_animation->setup(oldPoints, newPoints, index);
-        setGeometryPoints(newPoints);
+        m_points = newPoints;
         setDirty(false);
         presenter()->startAnimation(m_animation);
     }
     else {
-        setGeometryPoints(newPoints);
+        m_points = newPoints;
         updateGeometry();
     }
 }
diff --git a/src/xychart/xychart_p.h b/src/xychart/xychart_p.h
index 368f8fb..b4bab5a 100644
--- a/src/xychart/xychart_p.h
+++ b/src/xychart/xychart_p.h
@@ -46,7 +46,7 @@ class XYChart :  public ChartElement
      Q_OBJECT
 public:
      explicit XYChart(QXYSeries *series, ChartPresenter *presenter);
-    ~XYChart(){};
+    ~XYChart() {}
 
     void setGeometryPoints(const QVector<QPointF>& points);
     QVector<QPointF> geometryPoints() const { return m_points; }
@@ -84,7 +84,7 @@ protected:
 private:
     inline bool isEmpty();
 
-private:
+protected:
     qreal m_minX;
     qreal m_maxX;
     qreal m_minY;