Graph DS 14th commit.

- Refactor code