Refactor SonarGraph service