Fix PMD
Fix PHPCS