corrected some PMD violations