Tidy up a few of the files