Added javadoc
PMD fixes