GIRAPH-409: Refactor / cleanups (nitay)