PHPMD cleanup