Some coding standard phpcs issues