- another refactor / fix for GraphWrapper constructor