Mostly stylistic adjustments.