filename tidy up