cleaning up file names is now less hacky