Fix a few PHPCS violations