Minimal refactor.
Merge branch 'refactoring-graph-dependencies'