clean up and changed file save to not have two file extensions