Cleanup with php-cs-fixer