Remove vim swap
Updated swap comments for clarity