Refactring and Add C-v paste