PHPMD Fixes