More CS Fixes

I've just run php-cs-fixer again after your latest changes.