clean up file names etc.