Tidy up the field bindings