Change fields
Tidy up a bit