Refactored a bit of the GraphNodeSet