Refactoring before creating the graph(s) in one step.