Cleanup: additional fixes for sonar
Cleanup: minor style fixes