- Graph refactoring