Fix [SonarQube] Strings should be compared using equals()
Fix [SonarQube] if/else/for/while/do statements should always use curly
braces
Convert concatenated string into formatted string
Format per coding convention
Update javadoc