Refactoring clone tools now - boundary done and tested, now on Clone Tool