Basic PHPCS clean-up