Fix PHPCS/PHPMD errors