Extracted Graph interface
Simplify graph generation
Cleaned graph-related classes