Tidy up in files