Refactoring benchmark ... for cleaner design