Removed PMD violations