Refactors Graph and guid()