Fix [SonarQube] if/else/for/while/do statements should always use curly
braces
Fix [SonarQube] Collapsible "if" statements should be merged