made a few semantic changes