misc changes for phpcs