Refactoring clone tools now - boundary done and tested