PHPMD tweaks