cleaning up and fixing filename to load