Make some phpcs fixes