Correction PMD
Correction Javadoc + CS