Refactor Sonar Graph