25 - refactoring the graph data generation further