Tidy up of schema file.