removed PMD warnings