Fix PHPMD Issues