Corrected javadoc
PMD/Findbugs cleanup