Numerous style changes.