Cleaned up the file name and file saving