Fixes from php-cs-fixer