Clean Up loading + php cs fixer