Update based on review feedback and PHPCS errors.