Fixes for PHPCS and PHPMD