Fixed build
removed PMD errors