PMD violations fixed