Tidy up files a little