form structure more consistent