Javadoc and PMD modifications.