many phpcs fixes