Fix [SonarQube]  if/else/for/while/do statements should always use curly
braces
Fix [SonarQube] String literals should not be duplicated (3x)
Update formatting per coding standard