Refactoring
Spec for yielding graph self