addressing PMD warnings
addressing pmd warnings