Tidy up file copying