pmd warnings fixed.