minor semantic changes