Some changes in PHPCS checks + some PHPCS fixes in the code