PHPCS and PHPMD fixes