Refactoring and removed swp file