Stylistic changes and minor simplifications