Tidied up some fields.