fixed sonar issues and formatted code

No match.