Fixing some more PHPCS/PHPMD errors
Fixing some more PHPCS/PHPMD errors