Fix [SonarQube] Avoid commented-out lines of code (Rewrite commented-out
lines of code as a desciptive comment)
Add whitespace for readability
Fix [SonarQube] Avoid commented-out lines of code (A block of
commented-out lines of code should be removed)
Add whitespace for readability
Update javadoc
Update javadoc
Update javadoc
Fix [SonarQube] if/else/for/while/do statements should always use curly
braces