remove swap file
Refactoring and Renaming