Refactor SonarGraph
Refactor SonarGraph service