Clean up
Merge points code into iD.svg.Points