Sonar Violations and Formatting

Yeah, I changed line 70 and 71