Sonar Violations and Formatting

I cant tell what you did here besides reformat the whole file. Are there any other changes?