Feature/php cs fixer improvements