Resolve a few Sonar issues about unused variables and missing curly
braces