Refactoring (MovableDataPoint to DataPoint)