Minor Clean ups for graph