Lots of stylistic changes.