Reducing complexity of more graph_generator methods