Cleaned up some swap files and filenames