Updating project to prevent any PHPMD or PHPCS errors creeping in