Style changes and simplifications.