Some phpcs fixes from php-cs-fixer project