Refactor SonarManager

Modified.