Some cleanup and path seperation for data points