refactor cleaner.php and CrudTest.php