Assorted cleanup

Sonar remediation, white space cleanup and comment updates.