Fixed sonar issues
Mostly formatting issues