remove word separators
ignore swp files
minor refactoring