Refactoring clone tools now