stylistic changes, and some excessive assertions