Started working on clone refactorings