Sonar Violations and Formatting

You reformatted commented out code? How about deleting it?