Fixing sonar and javadoc issues.