Fixing some more PHPCS/PHPMD errors