Corrected PMD warnings