Fixing PHPMD rules