Several style changes.