a few stylistic changes