Style changes, and very minor restructuring.