Code fixes with PHPCS fixer