Review for  Review Javadoc and Sonar issues #3