Fix [SonarQube] if/else/for/while/do statements should always use curly
braces
Update javadoc
Fix [SonarQube] Empty statements should be removed
Fix [SonarQube] Avoid commented-out lines of code
Fix [SonarQube] if/else/for/while/do statements should always use curly
braces