#392 PHPCS fixes