Fixing phpcs failures