Fix phpcs
Fix PMD, remove unused variable