PMD violations fix