Refactor SonarManager

Yes, please.