Fixed/commented PMD violations