Fix CS issues with php-cs-fixer