Refactored clone-home