Refactorin  Point->Vertex