Added Javadoc and Sonar fixes.