More strict phpcs