minor form style tweaks