Refactoring and revert dragging