Minor nonfunctional changes