refactor
fix test
ignore .swp files