minor cleanup of input forms