Fix [SonarQube]if/else/for/while/do statements should always use curly
braces
Fix [SonarQube] Loose coupling (Avoid using implementation types like
'ArrayList'; use the interface instead)