Tweaked PHPMD and PHPCS rules