Whitespace....
Minor sonar fixes
Ran format