change filename, tidy up