[UPDATE] Quick tidy up of a couple of files.