More PHPMD cleanup.