Some more tidyup of the form