fix as much as possible according to php-cs-fixer