PHPMD fixes