simplifications
php-cs-fixer pass