fixed tests
deleted swp file
moved imports
refactored implementation
modified gitignore