Some cleanup to MarkersChart