small datagraph refactor