Addressing PMD warnings