Fixing phpcs issues