Add javadoc
Fix [SonarQube] TODO tags should be handled (Add doc)
format per coding standard