Addresses some stylistic changes.