Sonar Violations and Formatting

We can look at it together