Refactor SonarGraph