Refactoring and fixed clone bug.